From 67e12b95ea7b68f4904a7484d77ecfd787d16d0c Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Tue, 30 Oct 2007 09:05:31 +0000 Subject: * Optimized usings * Shortened type references * Removed redundant 'this' qualifier --- .../Configuration/HTTP/HTTPConfiguration.cs | 26 ++++++++++------------ .../Configuration/HTTP/RemoteConfigSettings.cs | 20 ++++++++--------- .../Configuration/XML/XmlConfiguration.cs | 16 ++++++------- 3 files changed, 30 insertions(+), 32 deletions(-) (limited to 'OpenSim/Framework/Configuration') diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs index efe6ebb..0d48683 100644 --- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs +++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs @@ -26,21 +26,18 @@ * */ -using System; -using System.Collections.Generic; -using System.Net; using System.IO; +using System.Net; using System.Text; - -using OpenSim.Framework; +using OpenSim.Framework.Console; namespace OpenSim.Framework.Configuration.HTTP { public class HTTPConfiguration : IGenericConfig { - RemoteConfigSettings remoteConfigSettings; + private RemoteConfigSettings remoteConfigSettings; - XmlConfiguration xmlConfig; + private XmlConfiguration xmlConfig; private string configFileName = ""; @@ -62,8 +59,9 @@ namespace OpenSim.Framework.Configuration.HTTP StringBuilder sb = new StringBuilder(); byte[] buf = new byte[8192]; - HttpWebRequest request = (HttpWebRequest)WebRequest.Create(this.remoteConfigSettings.baseConfigURL + this.configFileName); - HttpWebResponse response = (HttpWebResponse)request.GetResponse(); + HttpWebRequest request = + (HttpWebRequest) WebRequest.Create(remoteConfigSettings.baseConfigURL + configFileName); + HttpWebResponse response = (HttpWebResponse) request.GetResponse(); Stream resStream = response.GetResponseStream(); @@ -78,13 +76,14 @@ namespace OpenSim.Framework.Configuration.HTTP tempString = Encoding.ASCII.GetString(buf, 0, count); sb.Append(tempString); } - } - while (count > 0); + } while (count > 0); LoadDataFromString(sb.ToString()); } catch (WebException) { - Console.MainLog.Instance.Warn("Unable to connect to remote configuration file (" + remoteConfigSettings.baseConfigURL + configFileName + "). Creating local file instead."); + MainLog.Instance.Warn("Unable to connect to remote configuration file (" + + remoteConfigSettings.baseConfigURL + configFileName + + "). Creating local file instead."); xmlConfig.SetFileName(configFileName); xmlConfig.LoadData(); } @@ -93,7 +92,6 @@ namespace OpenSim.Framework.Configuration.HTTP public void LoadDataFromString(string data) { xmlConfig.LoadDataFromString(data); - } public string GetAttribute(string attributeName) @@ -114,4 +112,4 @@ namespace OpenSim.Framework.Configuration.HTTP { } } -} +} \ No newline at end of file diff --git a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs index 3ac03bb..332066c 100644 --- a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs +++ b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs @@ -26,12 +26,6 @@ * */ -using System; -using System.Collections.Generic; -using System.Text; - -using OpenSim.Framework; - namespace OpenSim.Framework.Configuration.HTTP { public class RemoteConfigSettings @@ -39,24 +33,30 @@ namespace OpenSim.Framework.Configuration.HTTP private ConfigurationMember configMember; public string baseConfigURL = ""; + public RemoteConfigSettings(string filename) { - configMember = new ConfigurationMember(filename, "REMOTE CONFIG SETTINGS", loadConfigurationOptions, handleIncomingConfiguration); + configMember = + new ConfigurationMember(filename, "REMOTE CONFIG SETTINGS", loadConfigurationOptions, + handleIncomingConfiguration); configMember.forceConfigurationPluginLibrary("OpenSim.Framework.Configuration.XML.dll"); configMember.performConfigurationRetrieve(); } public void loadConfigurationOptions() { - configMember.addConfigurationOption("base_config_url", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "URL Containing Configuration Files", "http://localhost/", false); + configMember.addConfigurationOption("base_config_url", + ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, + "URL Containing Configuration Files", "http://localhost/", false); } + public bool handleIncomingConfiguration(string configuration_key, object configuration_result) { if (configuration_key == "base_config_url") { - baseConfigURL = (string)configuration_result; + baseConfigURL = (string) configuration_result; } return true; } } -} +} \ No newline at end of file diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs index 52db852..152dec5 100644 --- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs +++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs @@ -25,12 +25,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ + using System; using System.IO; using System.Xml; -using OpenSim.Framework; - namespace OpenSim.Framework.Configuration { public class XmlConfiguration : IGenericConfig @@ -56,6 +55,7 @@ namespace OpenSim.Framework.Configuration if (configNode.Name != "Config") throw new Exception("Error: Invalid .xml File. first child should be "); } + public void LoadData() { lock (this) @@ -81,7 +81,7 @@ namespace OpenSim.Framework.Configuration if (createdFile) { - this.Commit(); + Commit(); } } } @@ -93,12 +93,13 @@ namespace OpenSim.Framework.Configuration LoadDataToClass(); } + public string GetAttribute(string attributeName) { string result = null; if (configNode.Attributes[attributeName] != null) { - result = ((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value; + result = ((XmlAttribute) configNode.Attributes.GetNamedItem(attributeName)).Value; } return result; } @@ -107,7 +108,7 @@ namespace OpenSim.Framework.Configuration { if (configNode.Attributes[attributeName] != null) { - ((XmlAttribute)configNode.Attributes.GetNamedItem(attributeName)).Value = attributeValue; + ((XmlAttribute) configNode.Attributes.GetNamedItem(attributeName)).Value = attributeValue; } else { @@ -124,7 +125,7 @@ namespace OpenSim.Framework.Configuration if (!Directory.Exists(Util.configDir())) { Directory.CreateDirectory(Util.configDir()); - } + } doc.Save(fileName); } @@ -134,6 +135,5 @@ namespace OpenSim.Framework.Configuration rootNode = null; doc = null; } - } -} +} \ No newline at end of file -- cgit v1.1