More formatting cleanup. Minor refactoring.

1 files changed, 72 insertions, 35 deletions

diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 2c84ef9..43d8c32 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -56,7 +56,8 @@ namespace OpenSim.Data.NHibernate
         {
             char[] split = {';'};
             string[] parts = connect.Split(split, 3);
-            if (parts.Length != 3) {
+            if (parts.Length != 3)
+            {
                 // TODO: make this a real exception type
                 throw new Exception("Malformed Inventory connection string '" + connect + "'");
             }
@@ -87,15 +88,22 @@ namespace OpenSim.Data.NHibernate
         {
             string regex = @"no such table: UserProfiles";
             Regex RE = new Regex(regex, RegexOptions.Multiline);
-            try {
-                using (ISession session = factory.OpenSession()) {
+            try
+            {
+                using (ISession session = factory.OpenSession())
+                {
                     session.Load(typeof(UserProfileData), LLUUID.Zero);
                 }
-            } catch (ObjectNotFoundException) {
+            }
+            catch (ObjectNotFoundException)
+            {
                 // yes, we know it's not there, but that's ok
-            } catch (ADOException e) {
+            }
+            catch (ADOException e)
+            {
                 Match m = RE.Match(e.ToString());
-                if (m.Success) {
+                if (m.Success)
+                {
                     // We don't have this table, so create it.
                     new SchemaExport(cfg).Create(true, true);
                 }
@@ -105,12 +113,15 @@ namespace OpenSim.Data.NHibernate
         private bool ExistsUser(LLUUID uuid)
         {
             UserProfileData user = null;
-            try {
-                using (ISession session = factory.OpenSession()) {
+            try
+            {
+                using (ISession session = factory.OpenSession())
+                {
                     user = session.Load(typeof(UserProfileData), uuid) as UserProfileData;
                 }
                 // BUG: CATCHALL IS BAD.
-            } catch (Exception) {}
+            }
+            catch (Exception) {}
             
             return (user != null);
         }
@@ -119,7 +130,8 @@ namespace OpenSim.Data.NHibernate
         {
             UserProfileData user;
             // TODO: I'm sure I'll have to do something silly here
-            using (ISession session = factory.OpenSession()) {
+            using (ISession session = factory.OpenSession())
+            {
                 user = session.Load(typeof(UserProfileData), uuid) as UserProfileData;
                 user.CurrentAgent = GetAgentByUUID(uuid);
             }
@@ -128,16 +140,21 @@ namespace OpenSim.Data.NHibernate
 
         override public void AddNewUserProfile(UserProfileData profile)
         {
-            if (!ExistsUser(profile.ID)) {
-                using (ISession session = factory.OpenSession()) {
-                    using (ITransaction transaction = session.BeginTransaction()) {
+            if (!ExistsUser(profile.ID))
+            {
+                using (ISession session = factory.OpenSession())
+                {
+                    using (ITransaction transaction = session.BeginTransaction())
+                    {
                         session.Save(profile);
                         SetAgentData(profile.ID, profile.CurrentAgent, session);
                         // TODO: save agent
                         transaction.Commit();
                     }
                 } 
-            } else {
+            }
+            else
+            {
                 m_log.ErrorFormat("Attempted to add User {0} {1} that already exists, updating instead", profile.FirstName, profile.SurName);
                 UpdateUserProfile(profile);
             }
@@ -165,16 +182,21 @@ namespace OpenSim.Data.NHibernate
         }
         override public bool UpdateUserProfile(UserProfileData profile)
         {
-            if (ExistsUser(profile.ID)) {
-                using (ISession session = factory.OpenSession()) {
-                    using (ITransaction transaction = session.BeginTransaction()) {
+            if (ExistsUser(profile.ID))
+            {
+                using (ISession session = factory.OpenSession())
+                {
+                    using (ITransaction transaction = session.BeginTransaction())
+                    {
                         session.Update(profile);
                         SetAgentData(profile.ID, profile.CurrentAgent, session);
                         transaction.Commit();
                         return true;
                     }
                 } 
-            } else {
+            }
+            else
+            {
                 m_log.ErrorFormat("Attempted to update User {0} {1} that doesn't exist, updating instead", profile.FirstName, profile.SurName);
                 AddNewUserProfile(profile);
                 return true;
@@ -183,8 +205,10 @@ namespace OpenSim.Data.NHibernate
         
         override public void AddNewUserAgent(UserAgentData agent)
         {
-            using (ISession session = factory.OpenSession()) {
-                using (ITransaction transaction = session.BeginTransaction()) {
+            using (ISession session = factory.OpenSession())
+            {
+                using (ITransaction transaction = session.BeginTransaction())
+                {
                     session.Save(agent);
                     transaction.Commit();
                 }
@@ -193,30 +217,35 @@ namespace OpenSim.Data.NHibernate
         
         public void UpdateUserAgent(UserAgentData agent)
         {
-            using (ISession session = factory.OpenSession()) {
-                using (ITransaction transaction = session.BeginTransaction()) {
+            using (ISession session = factory.OpenSession())
+            {
+                using (ITransaction transaction = session.BeginTransaction())
+                {
                     session.Update(agent);
                     transaction.Commit();
                 }
             } 
         }
 
-        
-
         override public UserAgentData GetAgentByUUID(LLUUID uuid)
         {
-            try {
-                using (ISession session = factory.OpenSession()) {
+            try
+            {
+                using (ISession session = factory.OpenSession())
+                {
                     return session.Load(typeof(UserAgentData), uuid) as UserAgentData;
                 }
-            } catch {
+            }
+            catch
+            {
                 return null;
             }
         }
 
         override public UserProfileData GetUserByName(string fname, string lname)
         {
-            using (ISession session = factory.OpenSession()) {
+            using (ISession session = factory.OpenSession())
+            {
                 ICriteria criteria = session.CreateCriteria(typeof(UserProfileData));
                 criteria.Add(Expression.Eq("FirstName", fname));
                 criteria.Add(Expression.Eq("SurName", lname));
@@ -247,7 +276,8 @@ namespace OpenSim.Data.NHibernate
             
             if (querysplit.Length == 2)
             {
-                using (ISession session = factory.OpenSession()) {
+                using (ISession session = factory.OpenSession())
+                {
                     ICriteria criteria = session.CreateCriteria(typeof(UserProfileData));
                     criteria.Add(Expression.Like("FirstName", querysplit[0]));
                     criteria.Add(Expression.Like("SurName", querysplit[1]));
@@ -280,7 +310,8 @@ namespace OpenSim.Data.NHibernate
         {
             UserAppearance appearance;
             // TODO: I'm sure I'll have to do something silly here
-            using (ISession session = factory.OpenSession()) {
+            using (ISession session = factory.OpenSession())
+            {
                 appearance = session.Load(typeof(UserAppearance), user) as UserAppearance;
             }
             return appearance;
@@ -289,7 +320,8 @@ namespace OpenSim.Data.NHibernate
         private bool ExistsAppearance(LLUUID uuid)
         {
             UserAppearance appearance;
-            using (ISession session = factory.OpenSession()) {
+            using (ISession session = factory.OpenSession())
+            {
                 appearance = session.Load(typeof(UserAppearance), uuid) as UserAppearance;
             }
             return (appearance == null) ? false : true;
@@ -299,11 +331,16 @@ namespace OpenSim.Data.NHibernate
         override public void UpdateUserAppearance(LLUUID user, UserAppearance appearance)
         {
             bool exists = ExistsAppearance(user);
-            using (ISession session = factory.OpenSession()) {
-                using (ITransaction transaction = session.BeginTransaction()) {
-                    if (exists) {
+            using (ISession session = factory.OpenSession())
+            {
+                using (ITransaction transaction = session.BeginTransaction())
+                {
+                    if (exists)
+                    {
                         session.Update(appearance);
-                    } else {
+                    }
+                    else
+                    {
                         session.Save(appearance);
                     }
                     transaction.Commit();