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/SQLite/SQLiteAssetData.cs           |  2 +-
 OpenSim/Data/SQLite/SQLiteEstateData.cs          |  9 +++------
 OpenSim/Data/SQLite/SQLiteGridData.cs            |  4 +---
 OpenSim/Data/SQLite/SQLiteInventoryStore.cs      |  2 +-
 OpenSim/Data/SQLite/SQLiteManager.cs             |  2 +-
 OpenSim/Data/SQLite/SQLiteRegionData.cs          |  5 ++---
 OpenSim/Data/SQLite/SQLiteUserData.cs            |  4 ++--
 OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs     |  9 +--------
 OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs    |  7 -------
 OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs | 10 +---------
 OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs    |  9 +--------
 OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs      |  9 +--------
 12 files changed, 15 insertions(+), 57 deletions(-)

(limited to 'OpenSim/Data/SQLite')

diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index d28956f..f6f62a7 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -28,9 +28,9 @@
 using System;
 using System.Data;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using Mono.Data.SqliteClient;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Data.SQLite
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index 46d29a3..3fb33c2 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.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 Mono.Data.SqliteClient;
 using log4net;
+using Mono.Data.SqliteClient;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Data.SQLite
 {
@@ -109,7 +106,7 @@ namespace OpenSim.Data.SQLite
                         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/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
index 5b0455d..6c7c58c 100644
--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridData.cs
@@ -29,10 +29,8 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using System.Security.Cryptography;
-using System.Text;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Data.SQLite
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index c497396..6391c6d 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -29,9 +29,9 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using Mono.Data.SqliteClient;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Data.SQLite
diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs
index a936ec1..4d45d08 100644
--- a/OpenSim/Data/SQLite/SQLiteManager.cs
+++ b/OpenSim/Data/SQLite/SQLiteManager.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SQLite;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 
 namespace OpenSim.Data.SQLite
 {
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 89308db..7ec4ceb 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -28,13 +28,12 @@
 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 Mono.Data.SqliteClient;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 1c36453..788a9ea 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -29,9 +29,9 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using Mono.Data.SqliteClient;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Data.SQLite
@@ -645,7 +645,7 @@ namespace OpenSim.Data.SQLite
             try {
                 aa = aplist[user];
                 m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString());
-            } catch (System.Collections.Generic.KeyNotFoundException) {
+            } catch (KeyNotFoundException) {
                 m_log.InfoFormat("[APPEARANCE] No appearance found for {0}", user.ToString());
             }
             return aa;
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
index 0de965d..60aa1f3 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
@@ -25,16 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-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.SQLite;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.SQLite.Tests
 {
@@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
         public void Cleanup()
         {
             db.Dispose();
-            System.IO.File.Delete(file);
+            File.Delete(file);
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
index 31efcc3..774cca1 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
@@ -25,16 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-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.SQLite;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.SQLite.Tests
 {
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
index 07b0dab..70903c3 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
@@ -25,17 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-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.SQLite;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using log4net;
 
 namespace OpenSim.Data.SQLite.Tests
 {
@@ -61,7 +53,7 @@ namespace OpenSim.Data.SQLite.Tests
         public void Cleanup()
         {
             db.Dispose();
-            System.IO.File.Delete(file);
+            File.Delete(file);
         }
     }
 }
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
index 86a1192..652a53a 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
@@ -25,16 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-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.SQLite;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.SQLite.Tests
 {
@@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
         public void Cleanup()
         {
             db.Dispose();
-            System.IO.File.Delete(file);
+            File.Delete(file);
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
index 0415219..6f8d89d 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
@@ -25,16 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-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.SQLite;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.SQLite.Tests
 {
@@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
         public void Cleanup()
         {
             db.Dispose();
-            System.IO.File.Delete(file);
+            File.Delete(file);
         }
     }
 }
\ No newline at end of file
-- 
cgit v1.1