* Optimized usings

* shortened references
* Removed redundant 'this'
* Normalized EOF

1 files changed, 87 insertions, 48 deletions

diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index 271c02c..a5ab613 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -27,24 +27,20 @@
 */
 
 using System;
-using System.Reflection;
-using System.Collections;
 using System.Collections.Generic;
-using System.Text;
+using System.Globalization;
 using System.Net;
+using System.Reflection;
 using System.Xml;
-
 using libsecondlife;
-
 using OpenSim.Framework.Console;
-using OpenSim.Framework;
-using System.Globalization;
 
 namespace OpenSim.Framework
 {
     public class ConfigurationMember
     {
         public delegate bool ConfigurationOptionResult(string configuration_key, object configuration_result);
+
         public delegate void ConfigurationOptionsLoad();
 
         private List<ConfigurationOption> configurationOptions = new List<ConfigurationOption>();
@@ -55,29 +51,36 @@ namespace OpenSim.Framework
         private ConfigurationOptionResult resultFunction;
 
         private IGenericConfig configurationPlugin = null;
+
         /// <summary>
         /// This is the default configuration DLL loaded
         /// </summary>
         private string configurationPluginFilename = "OpenSim.Framework.Configuration.XML.dll";
-        public ConfigurationMember(string configuration_filename, string configuration_description, ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function)
+
+        public ConfigurationMember(string configuration_filename, string configuration_description,
+                                   ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function)
         {
-            this.configurationFilename = configuration_filename;
-            this.configurationDescription = configuration_description;
-            this.loadFunction = load_function;
-            this.resultFunction = result_function;
+            configurationFilename = configuration_filename;
+            configurationDescription = configuration_description;
+            loadFunction = load_function;
+            resultFunction = result_function;
         }
-        public ConfigurationMember(XmlNode configuration_xml, string configuration_description, ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function)
+
+        public ConfigurationMember(XmlNode configuration_xml, string configuration_description,
+                                   ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function)
         {
-            this.configurationFilename = "";
-            this.configurationFromXMLNode = configuration_xml;
-            this.configurationDescription = configuration_description;
-            this.loadFunction = load_function;
-            this.resultFunction = result_function;
+            configurationFilename = "";
+            configurationFromXMLNode = configuration_xml;
+            configurationDescription = configuration_description;
+            loadFunction = load_function;
+            resultFunction = result_function;
         }
+
         public void setConfigurationFilename(string filename)
         {
             configurationFilename = filename;
         }
+
         public void setConfigurationDescription(string desc)
         {
             configurationDescription = desc;
@@ -92,9 +95,11 @@ namespace OpenSim.Framework
         {
             configurationPluginFilename = dll_filename;
         }
+
         private void checkAndAddConfigOption(ConfigurationOption option)
         {
-            if ((option.configurationKey != "" && option.configurationQuestion != "") || (option.configurationKey != "" && option.configurationUseDefaultNoPrompt))
+            if ((option.configurationKey != "" && option.configurationQuestion != "") ||
+                (option.configurationKey != "" && option.configurationUseDefaultNoPrompt))
             {
                 if (!configurationOptions.Contains(option))
                 {
@@ -103,11 +108,16 @@ namespace OpenSim.Framework
             }
             else
             {
-                MainLog.Instance.Notice("Required fields for adding a configuration option is invalid. Will not add this option (" + option.configurationKey + ")");
+                MainLog.Instance.Notice(
+                    "Required fields for adding a configuration option is invalid. Will not add this option (" +
+                    option.configurationKey + ")");
             }
         }
 
-        public void addConfigurationOption(string configuration_key, ConfigurationOption.ConfigurationTypes configuration_type, string configuration_question, string configuration_default, bool use_default_no_prompt)
+        public void addConfigurationOption(string configuration_key,
+                                           ConfigurationOption.ConfigurationTypes configuration_type,
+                                           string configuration_question, string configuration_default,
+                                           bool use_default_no_prompt)
         {
             ConfigurationOption configOption = new ConfigurationOption();
             configOption.configurationKey = configuration_key;
@@ -119,7 +129,11 @@ namespace OpenSim.Framework
             checkAndAddConfigOption(configOption);
         }
 
-        public void addConfigurationOption(string configuration_key, ConfigurationOption.ConfigurationTypes configuration_type, string configuration_question, string configuration_default, bool use_default_no_prompt, ConfigurationOption.ConfigurationOptionShouldBeAsked shouldIBeAskedDelegate)
+        public void addConfigurationOption(string configuration_key,
+                                           ConfigurationOption.ConfigurationTypes configuration_type,
+                                           string configuration_question, string configuration_default,
+                                           bool use_default_no_prompt,
+                                           ConfigurationOption.ConfigurationOptionShouldBeAsked shouldIBeAskedDelegate)
         {
             ConfigurationOption configOption = new ConfigurationOption();
             configOption.configurationKey = configuration_key;
@@ -133,26 +147,30 @@ namespace OpenSim.Framework
 
         public void performConfigurationRetrieve()
         {
-            configurationPlugin = this.LoadConfigDll(configurationPluginFilename);
+            configurationPlugin = LoadConfigDll(configurationPluginFilename);
             configurationOptions.Clear();
-            if(loadFunction == null)
+            if (loadFunction == null)
             {
-                MainLog.Instance.Error("Load Function for '" + this.configurationDescription + "' is null. Refusing to run configuration.");
+                MainLog.Instance.Error("Load Function for '" + configurationDescription +
+                                       "' is null. Refusing to run configuration.");
                 return;
             }
 
-            if(resultFunction == null)
+            if (resultFunction == null)
             {
-                MainLog.Instance.Error("Result Function for '" + this.configurationDescription + "' is null. Refusing to run configuration.");
+                MainLog.Instance.Error("Result Function for '" + configurationDescription +
+                                       "' is null. Refusing to run configuration.");
                 return;
             }
 
             MainLog.Instance.Verbose("CONFIG", "Calling Configuration Load Function...");
-            this.loadFunction();
+            loadFunction();
 
-            if(configurationOptions.Count <= 0)
+            if (configurationOptions.Count <= 0)
             {
-                MainLog.Instance.Error("CONFIG", "No configuration options were specified for '" + this.configurationOptions + "'. Refusing to continue configuration.");
+                MainLog.Instance.Error("CONFIG",
+                                       "No configuration options were specified for '" + configurationOptions +
+                                       "'. Refusing to continue configuration.");
                 return;
             }
 
@@ -179,7 +197,7 @@ namespace OpenSim.Framework
             }
             else
             {
-                if (this.configurationFromXMLNode != null)
+                if (configurationFromXMLNode != null)
                 {
                     MainLog.Instance.Notice("Loading from XML Node, will not save to the file");
                     configurationPlugin.LoadDataFromString(configurationFromXMLNode.OuterXml);
@@ -219,15 +237,22 @@ namespace OpenSim.Framework
                         }
                         else
                         {
-                            if ((configOption.shouldIBeAsked != null && configOption.shouldIBeAsked(configOption.configurationKey)) || configOption.shouldIBeAsked == null)
+                            if ((configOption.shouldIBeAsked != null &&
+                                 configOption.shouldIBeAsked(configOption.configurationKey)) ||
+                                configOption.shouldIBeAsked == null)
                             {
                                 if (configurationDescription.Trim() != "")
                                 {
-                                    console_result = MainLog.Instance.CmdPrompt(configurationDescription + ": " + configOption.configurationQuestion, configOption.configurationDefault);
+                                    console_result =
+                                        MainLog.Instance.CmdPrompt(
+                                            configurationDescription + ": " + configOption.configurationQuestion,
+                                            configOption.configurationDefault);
                                 }
                                 else
                                 {
-                                    console_result = MainLog.Instance.CmdPrompt(configOption.configurationQuestion, configOption.configurationDefault);
+                                    console_result =
+                                        MainLog.Instance.CmdPrompt(configOption.configurationQuestion,
+                                                                   configOption.configurationDefault);
                                 }
                             }
                             else
@@ -235,7 +260,7 @@ namespace OpenSim.Framework
                                 //Dont Ask! Just use default
                                 console_result = configOption.configurationDefault;
                             }
-                        }                        
+                        }
                     }
                     else
                     {
@@ -366,7 +391,9 @@ namespace OpenSim.Framework
                             break;
                         case ConfigurationOption.ConfigurationTypes.TYPE_FLOAT:
                             float floatResult;
-                            if (float.TryParse(console_result, NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo, out floatResult))
+                            if (
+                                float.TryParse(console_result, NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo,
+                                               out floatResult))
                             {
                                 convertSuccess = true;
                                 return_result = floatResult;
@@ -375,7 +402,9 @@ namespace OpenSim.Framework
                             break;
                         case ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE:
                             double doubleResult;
-                            if (Double.TryParse(console_result, NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo, out doubleResult))
+                            if (
+                                Double.TryParse(console_result, NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo,
+                                                out doubleResult))
                             {
                                 convertSuccess = true;
                                 return_result = doubleResult;
@@ -391,9 +420,10 @@ namespace OpenSim.Framework
                             configurationPlugin.SetAttribute(configOption.configurationKey, console_result);
                         }
 
-                        if (!this.resultFunction(configOption.configurationKey, return_result))
+                        if (!resultFunction(configOption.configurationKey, return_result))
                         {
-                            Console.MainLog.Instance.Notice("The handler for the last configuration option denied that input, please try again.");
+                            MainLog.Instance.Notice(
+                                "The handler for the last configuration option denied that input, please try again.");
                             convertSuccess = false;
                             ignoreNextFromConfig = true;
                         }
@@ -402,19 +432,27 @@ namespace OpenSim.Framework
                     {
                         if (configOption.configurationUseDefaultNoPrompt)
                         {
-                            MainLog.Instance.Error("CONFIG", string.Format("[{3}]:[{1}] is not valid default for parameter [{0}].\nThe configuration result must be parsable to {2}.\n", configOption.configurationKey, console_result, errorMessage, configurationFilename));
+                            MainLog.Instance.Error("CONFIG",
+                                                   string.Format(
+                                                       "[{3}]:[{1}] is not valid default for parameter [{0}].\nThe configuration result must be parsable to {2}.\n",
+                                                       configOption.configurationKey, console_result, errorMessage,
+                                                       configurationFilename));
                             convertSuccess = true;
                         }
                         else
                         {
-                            MainLog.Instance.Warn("CONFIG", string.Format("[{3}]:[{1}] is not a valid value [{0}].\nThe configuration result must be parsable to {2}.\n", configOption.configurationKey, console_result, errorMessage, configurationFilename));
+                            MainLog.Instance.Warn("CONFIG",
+                                                  string.Format(
+                                                      "[{3}]:[{1}] is not a valid value [{0}].\nThe configuration result must be parsable to {2}.\n",
+                                                      configOption.configurationKey, console_result, errorMessage,
+                                                      configurationFilename));
                             ignoreNextFromConfig = true;
                         }
                     }
                 }
             }
 
-            if(useFile)
+            if (useFile)
             {
                 configurationPlugin.Commit();
                 configurationPlugin.Close();
@@ -436,7 +474,8 @@ namespace OpenSim.Framework
 
                         if (typeInterface != null)
                         {
-                            plug = (IGenericConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                            plug =
+                                (IGenericConfig) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
                         }
                     }
                 }
@@ -448,10 +487,10 @@ namespace OpenSim.Framework
 
         public void forceSetConfigurationOption(string configuration_key, string configuration_value)
         {
-            this.configurationPlugin.LoadData();
-            this.configurationPlugin.SetAttribute(configuration_key, configuration_value);
-            this.configurationPlugin.Commit();
-            this.configurationPlugin.Close();
+            configurationPlugin.LoadData();
+            configurationPlugin.SetAttribute(configuration_key, configuration_value);
+            configurationPlugin.Commit();
+            configurationPlugin.Close();
         }
     }
-}
+}
\ No newline at end of file