From 801da4346aeb3c08969c4845f5c595135a64470a Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Thu, 12 Feb 2009 09:53:12 +0000 Subject: * optimized usings. --- OpenSim/Data/MySQL/MySQLAssetData.cs | 12 +++++------- OpenSim/Data/MySQL/MySQLEstateData.cs | 11 ++++------- OpenSim/Data/MySQL/MySQLGridData.cs | 5 +++-- OpenSim/Data/MySQL/MySQLInventoryData.cs | 2 +- OpenSim/Data/MySQL/MySQLLogData.cs | 2 +- OpenSim/Data/MySQL/MySQLManager.cs | 8 ++++---- OpenSim/Data/MySQL/MySQLRegionData.cs | 8 ++++---- OpenSim/Data/MySQL/MySQLUserData.cs | 5 +++-- OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs | 9 +-------- OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs | 9 +-------- OpenSim/Data/MySQL/Tests/MySQLGridTest.cs | 9 +-------- OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs | 10 +--------- OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs | 9 +-------- OpenSim/Data/MySQL/Tests/MySQLUserTest.cs | 9 +-------- 14 files changed, 31 insertions(+), 77 deletions(-) (limited to 'OpenSim/Data/MySQL') diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index 823fa78..508e053 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs @@ -26,15 +26,13 @@ */ using System; -using System.Collections.Generic; using System.Data; using System.Reflection; -using OpenMetaverse; using log4net; using MySql.Data.MySqlClient; +using OpenMetaverse; using OpenSim.Framework; - namespace OpenSim.Data.MySQL { /// @@ -62,7 +60,7 @@ namespace OpenSim.Data.MySQL /// connect string override public void Initialise(string connect) { - TicksToEpoch = new System.DateTime(1970,1,1).Ticks; + TicksToEpoch = new DateTime(1970,1,1).Ticks; // TODO: This will let you pass in the connect string in // the config, though someone will need to write that. @@ -145,7 +143,7 @@ namespace OpenSim.Data.MySQL { asset.Metadata.Local = (bool)dbReader["local"]; } - catch (System.InvalidCastException) + catch (InvalidCastException) { asset.Metadata.Local = false; } @@ -199,7 +197,7 @@ namespace OpenSim.Data.MySQL using (cmd) { // create unix epoch time - int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000); + int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000); cmd.Parameters.AddWithValue("?id", asset.Metadata.ID); cmd.Parameters.AddWithValue("?name", asset.Metadata.Name); cmd.Parameters.AddWithValue("?description", asset.Metadata.Description); @@ -240,7 +238,7 @@ namespace OpenSim.Data.MySQL using (cmd) { // create unix epoch time - int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000); + int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000); cmd.Parameters.AddWithValue("?id", asset.Metadata.ID); cmd.Parameters.AddWithValue("?access_time", now); cmd.ExecuteNonQuery(); diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs index f811d84..5acbb9d 100644 --- a/OpenSim/Data/MySQL/MySQLEstateData.cs +++ b/OpenSim/Data/MySQL/MySQLEstateData.cs @@ -28,15 +28,12 @@ using System; using System.Collections.Generic; using System.Data; -using System.IO; using System.Reflection; -using System.Threading; -using OpenMetaverse; using log4net; using MySql.Data.MySqlClient; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Framework.Interfaces; -using OpenSim.Region.Framework.Scenes; namespace OpenSim.Data.MySQL { @@ -131,7 +128,7 @@ namespace OpenSim.Data.MySQL cmd.Dispose(); } - m_lastConnectionUse = System.DateTime.Now.Ticks; + m_lastConnectionUse = DateTime.Now.Ticks; m_log.DebugFormat( "[REGION DB]: Connection wait timeout {0} seconds", @@ -140,7 +137,7 @@ namespace OpenSim.Data.MySQL protected void CheckConnection() { - long timeNow = System.DateTime.Now.Ticks; + long timeNow = DateTime.Now.Ticks; if (timeNow - m_lastConnectionUse > m_waitTimeout || m_connection.State != ConnectionState.Open) { @@ -185,7 +182,7 @@ namespace OpenSim.Data.MySQL else m_FieldMap[name].SetValue(es, false); } - else if (m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID) + else if (m_FieldMap[name].GetValue(es) is UUID) { UUID uuid = UUID.Zero; diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs index 437747b..5c00330 100644 --- a/OpenSim/Data/MySQL/MySQLGridData.cs +++ b/OpenSim/Data/MySQL/MySQLGridData.cs @@ -29,8 +29,9 @@ using System; using System.Collections.Generic; using System.Data; using System.Reflection; -using OpenMetaverse; +using System.Threading; using log4net; +using OpenMetaverse; using OpenSim.Framework; namespace OpenSim.Data.MySQL @@ -78,7 +79,7 @@ namespace OpenSim.Data.MySQL if (lockedCons > m_maxConnections) { lockedCons = 0; - System.Threading.Thread.Sleep(1000); // Wait some time before searching them again. + Thread.Sleep(1000); // Wait some time before searching them again. m_log.Debug( "WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound."); } diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index efc781d..7d29061 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs @@ -28,9 +28,9 @@ using System; using System.Collections.Generic; using System.Reflection; -using OpenMetaverse; using log4net; using MySql.Data.MySqlClient; +using OpenMetaverse; using OpenSim.Framework; namespace OpenSim.Data.MySQL diff --git a/OpenSim/Data/MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs index c02016c..13361af 100644 --- a/OpenSim/Data/MySQL/MySQLLogData.cs +++ b/OpenSim/Data/MySQL/MySQLLogData.cs @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ using System; -using System.Reflection; using System.Collections.Generic; +using System.Reflection; using log4net; using OpenSim.Framework; diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs index f16795e..3bb6857 100644 --- a/OpenSim/Data/MySQL/MySQLManager.cs +++ b/OpenSim/Data/MySQL/MySQLManager.cs @@ -26,14 +26,14 @@ */ using System; -using System.Collections.Generic; using System.Collections; +using System.Collections.Generic; using System.Data; using System.IO; using System.Reflection; -using OpenMetaverse; using log4net; using MySql.Data.MySqlClient; +using OpenMetaverse; using OpenSim.Framework; namespace OpenSim.Data.MySQL @@ -148,7 +148,7 @@ namespace OpenSim.Data.MySQL cmd.Dispose(); } - m_lastConnectionUse = System.DateTime.Now.Ticks; + m_lastConnectionUse = DateTime.Now.Ticks; m_log.DebugFormat( "[REGION DB]: Connection wait timeout {0} seconds", m_waitTimeout / TimeSpan.TicksPerSecond); @@ -161,7 +161,7 @@ namespace OpenSim.Data.MySQL { //m_log.Debug("[REGION DB]: Checking connection"); - long timeNow = System.DateTime.Now.Ticks; + long timeNow = DateTime.Now.Ticks; if (timeNow - m_lastConnectionUse > m_waitTimeout || dbcon.State != ConnectionState.Open) { m_log.DebugFormat("[REGION DB]: Database connection has gone away - reconnecting"); diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs index ab55ba5..4b07ed6 100644 --- a/OpenSim/Data/MySQL/MySQLRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLRegionData.cs @@ -28,13 +28,13 @@ using System; using System.Collections.Generic; using System.Data; +using System.Drawing; using System.IO; using System.Reflection; using System.Threading; -using System.Drawing; -using OpenMetaverse; using log4net; using MySql.Data.MySqlClient; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; @@ -89,7 +89,7 @@ namespace OpenSim.Data.MySQL } catch (Exception) { - System.Threading.Thread.Sleep(500); + Thread.Sleep(500); m_Connection.Close(); m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone(); @@ -122,7 +122,7 @@ namespace OpenSim.Data.MySQL } catch (Exception) { - System.Threading.Thread.Sleep(500); + Thread.Sleep(500); m_Connection.Close(); m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone(); diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs index f6a9af3..0f167b2 100644 --- a/OpenSim/Data/MySQL/MySQLUserData.cs +++ b/OpenSim/Data/MySQL/MySQLUserData.cs @@ -31,8 +31,9 @@ using System.Collections.Generic; using System.Data; using System.Reflection; using System.Text.RegularExpressions; -using OpenMetaverse; +using System.Threading; using log4net; +using OpenMetaverse; using OpenSim.Framework; namespace OpenSim.Data.MySQL @@ -93,7 +94,7 @@ namespace OpenSim.Data.MySQL if (lockedCons > m_maxConnections) { lockedCons = 0; - System.Threading.Thread.Sleep(1000); // Wait some time before searching them again. + Thread.Sleep(1000); // Wait some time before searching them again. m_log.Debug( "WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound."); m_log.Debug("Current connections-in-use dump:"); diff --git a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs index 0f7c9cd..d03e66c 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs @@ -26,15 +26,8 @@ */ using System; -using System.IO; -using System.Collections.Generic; using NUnit.Framework; -using NUnit.Framework.SyntaxHelpers; -using OpenSim.Framework; using OpenSim.Data.Tests; -using OpenSim.Data.MySQL; -using OpenSim.Region.Framework.Scenes; -using OpenMetaverse; namespace OpenSim.Data.MySQL.Tests { @@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests } catch (Exception e) { - System.Console.WriteLine("Exception {0}", e); + Console.WriteLine("Exception {0}", e); Assert.Ignore(); } } diff --git a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs index bee3d04..f148385 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs @@ -26,15 +26,8 @@ */ using System; -using System.IO; -using System.Collections.Generic; using NUnit.Framework; -using NUnit.Framework.SyntaxHelpers; -using OpenSim.Framework; using OpenSim.Data.Tests; -using OpenSim.Data.MySQL; -using OpenSim.Region.Framework.Scenes; -using OpenMetaverse; namespace OpenSim.Data.MySQL.Tests { @@ -63,7 +56,7 @@ namespace OpenSim.Data.MySQL.Tests } catch (Exception e) { - System.Console.WriteLine("Exception {0}", e); + Console.WriteLine("Exception {0}", e); Assert.Ignore(); } } diff --git a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs index 4638bca..953294f 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs @@ -26,15 +26,8 @@ */ using System; -using System.IO; -using System.Collections.Generic; using NUnit.Framework; -using NUnit.Framework.SyntaxHelpers; -using OpenSim.Framework; using OpenSim.Data.Tests; -using OpenSim.Data.MySQL; -using OpenSim.Region.Framework.Scenes; -using OpenMetaverse; namespace OpenSim.Data.MySQL.Tests { @@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests } catch (Exception e) { - System.Console.WriteLine("Exception {0}", e); + Console.WriteLine("Exception {0}", e); Assert.Ignore(); } } diff --git a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs index 8c7d820..e03e38d 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs @@ -26,16 +26,8 @@ */ using System; -using System.IO; -using System.Collections.Generic; using NUnit.Framework; -using NUnit.Framework.SyntaxHelpers; -using OpenSim.Framework; using OpenSim.Data.Tests; -using OpenSim.Data.MySQL; -using OpenSim.Region.Framework.Scenes; -using OpenMetaverse; -using log4net; namespace OpenSim.Data.MySQL.Tests { @@ -62,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests } catch (Exception e) { - System.Console.WriteLine("Exception {0}", e); + Console.WriteLine("Exception {0}", e); Assert.Ignore(); } } diff --git a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs index 71e73c2..5cce53b 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs @@ -26,15 +26,8 @@ */ using System; -using System.IO; -using System.Collections.Generic; using NUnit.Framework; -using NUnit.Framework.SyntaxHelpers; -using OpenSim.Framework; using OpenSim.Data.Tests; -using OpenSim.Data.MySQL; -using OpenSim.Region.Framework.Scenes; -using OpenMetaverse; namespace OpenSim.Data.MySQL.Tests { @@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests } catch (Exception e) { - System.Console.WriteLine("Exception {0}", e); + Console.WriteLine("Exception {0}", e); Assert.Ignore(); } } diff --git a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs index 8448dd7..b74617e 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs @@ -26,15 +26,8 @@ */ using System; -using System.IO; -using System.Collections.Generic; using NUnit.Framework; -using NUnit.Framework.SyntaxHelpers; -using OpenSim.Framework; using OpenSim.Data.Tests; -using OpenSim.Data.MySQL; -using OpenSim.Region.Framework.Scenes; -using OpenMetaverse; namespace OpenSim.Data.MySQL.Tests { @@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests } catch (Exception e) { - System.Console.WriteLine("Exception {0}", e); + Console.WriteLine("Exception {0}", e); Assert.Ignore(); } } -- cgit v1.1