ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Optimized usings

Browse Source 
* Shortened type references
* Removed redundant 'this' qualifier
This commit is contained in:
lbsa71
2007-10-30 09:05:31 +00:00
parent c32d1f0562
commit 67e12b95ea
353 changed files with 15459 additions and 10338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
View File

@@ -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
{
}
}
}
}

20
OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
View File

@@ -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;
}
}
}
}

16
OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
View File

@@ -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. <Root> first child should be <Config>");
}
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;
}
}
}
}