diff options
author | Adam Frisby | 2008-01-15 02:09:55 +0000 |
---|---|---|
committer | Adam Frisby | 2008-01-15 02:09:55 +0000 |
commit | b25f9f322cdbcde7fd8c043137bf07992e5ef318 (patch) | |
tree | 7c1a5115b2849dfe388b825dd271271d347f9574 /OpenSim/Framework/Configuration | |
parent | Set svn:eol-style. (diff) | |
download | opensim-SC_OLD-b25f9f322cdbcde7fd8c043137bf07992e5ef318.zip opensim-SC_OLD-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.gz opensim-SC_OLD-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.bz2 opensim-SC_OLD-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.xz |
* Mother of all commits:
* Cleaned up copyright notices in AssemblyInfo.cs's
* Added Copyright headers to a bunch of files missing them
* Replaced several common string instances with a static constant to prevent reallocation of the same strings thousands of times. "" -> String.Empty is the first such candidate.
Diffstat (limited to '')
5 files changed, 18 insertions, 16 deletions
diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs index 0d48683..e27c88b 100644 --- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs +++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs | |||
@@ -39,7 +39,7 @@ namespace OpenSim.Framework.Configuration.HTTP | |||
39 | 39 | ||
40 | private XmlConfiguration xmlConfig; | 40 | private XmlConfiguration xmlConfig; |
41 | 41 | ||
42 | private string configFileName = ""; | 42 | private string configFileName = System.String.Empty; |
43 | 43 | ||
44 | public HTTPConfiguration() | 44 | public HTTPConfiguration() |
45 | { | 45 | { |
diff --git a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs index 8fddb60..8575d3b 100644 --- a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs +++ b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs | |||
@@ -32,7 +32,7 @@ namespace OpenSim.Framework.Configuration.HTTP | |||
32 | { | 32 | { |
33 | private ConfigurationMember configMember; | 33 | private ConfigurationMember configMember; |
34 | 34 | ||
35 | public string baseConfigURL = ""; | 35 | public string baseConfigURL = System.String.Empty; |
36 | 36 | ||
37 | public RemoteConfigSettings(string filename) | 37 | public RemoteConfigSettings(string filename) |
38 | { | 38 | { |
diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs index 8bb31f8..4c50e53 100644 --- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs +++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs | |||
@@ -71,9 +71,9 @@ namespace OpenSim.Framework.Configuration | |||
71 | else | 71 | else |
72 | { | 72 | { |
73 | createdFile = true; | 73 | createdFile = true; |
74 | rootNode = doc.CreateNode(XmlNodeType.Element, "Root", ""); | 74 | rootNode = doc.CreateNode(XmlNodeType.Element, "Root", String.Empty); |
75 | doc.AppendChild(rootNode); | 75 | doc.AppendChild(rootNode); |
76 | configNode = doc.CreateNode(XmlNodeType.Element, "Config", ""); | 76 | configNode = doc.CreateNode(XmlNodeType.Element, "Config", String.Empty); |
77 | rootNode.AppendChild(configNode); | 77 | rootNode.AppendChild(configNode); |
78 | } | 78 | } |
79 | 79 | ||
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs index 4ae59d6..7590495 100644 --- a/OpenSim/Framework/ConfigurationMember.cs +++ b/OpenSim/Framework/ConfigurationMember.cs | |||
@@ -44,8 +44,8 @@ namespace OpenSim.Framework | |||
44 | public delegate void ConfigurationOptionsLoad(); | 44 | public delegate void ConfigurationOptionsLoad(); |
45 | 45 | ||
46 | private List<ConfigurationOption> configurationOptions = new List<ConfigurationOption>(); | 46 | private List<ConfigurationOption> configurationOptions = new List<ConfigurationOption>(); |
47 | private string configurationFilename = ""; | 47 | private string configurationFilename = String.Empty; |
48 | private string configurationDescription = ""; | 48 | private string configurationDescription = String.Empty; |
49 | private XmlNode configurationFromXMLNode = null; | 49 | private XmlNode configurationFromXMLNode = null; |
50 | private ConfigurationOptionsLoad loadFunction; | 50 | private ConfigurationOptionsLoad loadFunction; |
51 | private ConfigurationOptionResult resultFunction; | 51 | private ConfigurationOptionResult resultFunction; |
@@ -70,7 +70,7 @@ namespace OpenSim.Framework | |||
70 | public ConfigurationMember(XmlNode configuration_xml, string configuration_description, | 70 | public ConfigurationMember(XmlNode configuration_xml, string configuration_description, |
71 | ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function, bool use_console_to_prompt_on_error) | 71 | ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function, bool use_console_to_prompt_on_error) |
72 | { | 72 | { |
73 | configurationFilename = ""; | 73 | configurationFilename = String.Empty; |
74 | configurationFromXMLNode = configuration_xml; | 74 | configurationFromXMLNode = configuration_xml; |
75 | configurationDescription = configuration_description; | 75 | configurationDescription = configuration_description; |
76 | loadFunction = load_function; | 76 | loadFunction = load_function; |
@@ -100,8 +100,8 @@ namespace OpenSim.Framework | |||
100 | 100 | ||
101 | private void checkAndAddConfigOption(ConfigurationOption option) | 101 | private void checkAndAddConfigOption(ConfigurationOption option) |
102 | { | 102 | { |
103 | if ((option.configurationKey != "" && option.configurationQuestion != "") || | 103 | if ((option.configurationKey != String.Empty && option.configurationQuestion != String.Empty) || |
104 | (option.configurationKey != "" && option.configurationUseDefaultNoPrompt)) | 104 | (option.configurationKey != String.Empty && option.configurationUseDefaultNoPrompt)) |
105 | { | 105 | { |
106 | if (!configurationOptions.Contains(option)) | 106 | if (!configurationOptions.Contains(option)) |
107 | { | 107 | { |
@@ -190,7 +190,7 @@ namespace OpenSim.Framework | |||
190 | return; | 190 | return; |
191 | } | 191 | } |
192 | 192 | ||
193 | if (configurationFilename.Trim() != "") | 193 | if (configurationFilename.Trim() != String.Empty) |
194 | { | 194 | { |
195 | configurationPlugin.SetFileName(configurationFilename); | 195 | configurationPlugin.SetFileName(configurationFilename); |
196 | try | 196 | try |
@@ -220,11 +220,11 @@ namespace OpenSim.Framework | |||
220 | { | 220 | { |
221 | bool convertSuccess = false; | 221 | bool convertSuccess = false; |
222 | object return_result = null; | 222 | object return_result = null; |
223 | string errorMessage = ""; | 223 | string errorMessage = String.Empty; |
224 | bool ignoreNextFromConfig = false; | 224 | bool ignoreNextFromConfig = false; |
225 | while (convertSuccess == false) | 225 | while (convertSuccess == false) |
226 | { | 226 | { |
227 | string console_result = ""; | 227 | string console_result = String.Empty; |
228 | string attribute = null; | 228 | string attribute = null; |
229 | if (useFile || configurationFromXMLNode != null) | 229 | if (useFile || configurationFromXMLNode != null) |
230 | { | 230 | { |
@@ -250,7 +250,7 @@ namespace OpenSim.Framework | |||
250 | configOption.shouldIBeAsked(configOption.configurationKey)) || | 250 | configOption.shouldIBeAsked(configOption.configurationKey)) || |
251 | configOption.shouldIBeAsked == null) | 251 | configOption.shouldIBeAsked == null) |
252 | { | 252 | { |
253 | if (configurationDescription.Trim() != "") | 253 | if (configurationDescription.Trim() != String.Empty) |
254 | { | 254 | { |
255 | console_result = | 255 | console_result = |
256 | MainLog.Instance.CmdPrompt( | 256 | MainLog.Instance.CmdPrompt( |
diff --git a/OpenSim/Framework/ConfigurationOption.cs b/OpenSim/Framework/ConfigurationOption.cs index 7f9b5b5..d8be6f8 100644 --- a/OpenSim/Framework/ConfigurationOption.cs +++ b/OpenSim/Framework/ConfigurationOption.cs | |||
@@ -26,6 +26,8 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | 28 | ||
29 | using System; | ||
30 | |||
29 | namespace OpenSim.Framework | 31 | namespace OpenSim.Framework |
30 | { | 32 | { |
31 | public class ConfigurationOption | 33 | public class ConfigurationOption |
@@ -52,9 +54,9 @@ namespace OpenSim.Framework | |||
52 | TYPE_DOUBLE | 54 | TYPE_DOUBLE |
53 | } ; | 55 | } ; |
54 | 56 | ||
55 | public string configurationKey = ""; | 57 | public string configurationKey = String.Empty; |
56 | public string configurationQuestion = ""; | 58 | public string configurationQuestion = String.Empty; |
57 | public string configurationDefault = ""; | 59 | public string configurationDefault = String.Empty; |
58 | 60 | ||
59 | public ConfigurationTypes configurationType = ConfigurationTypes.TYPE_STRING; | 61 | public ConfigurationTypes configurationType = ConfigurationTypes.TYPE_STRING; |
60 | public bool configurationUseDefaultNoPrompt = false; | 62 | public bool configurationUseDefaultNoPrompt = false; |