diff options
author | Adam Frisby | 2008-04-21 07:09:17 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-21 07:09:17 +0000 |
commit | fef3b3689492dea63693c964bcdbec9f5137eb5e (patch) | |
tree | 7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs | |
parent | * Terrain Module code has been reformatted to comply with guidelines. (diff) | |
download | opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2 opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz |
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to 'OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs b/OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs index 9834a8a..27d73b5 100644 --- a/OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs +++ b/OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs | |||
@@ -27,8 +27,10 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | ||
30 | using System.Text; | 31 | using System.Text; |
31 | 32 | using log4net; | |
33 | using OpenSim.Framework; | ||
32 | using OpenSim.Region.Environment.Interfaces; | 34 | using OpenSim.Region.Environment.Interfaces; |
33 | 35 | ||
34 | namespace OpenSim.Region.Environment.Modules.ModuleFramework | 36 | namespace OpenSim.Region.Environment.Modules.ModuleFramework |
@@ -39,9 +41,9 @@ namespace OpenSim.Region.Environment.Modules.ModuleFramework | |||
39 | /// </summary> | 41 | /// </summary> |
40 | public class Command : ICommand | 42 | public class Command : ICommand |
41 | { | 43 | { |
42 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | 45 | ||
44 | private Action<Object[]> m_command; | 46 | private Action<object[]> m_command; |
45 | private string m_name; | 47 | private string m_name; |
46 | private string m_help; | 48 | private string m_help; |
47 | private List<CommandArgument> m_args = new List<CommandArgument>(); | 49 | private List<CommandArgument> m_args = new List<CommandArgument>(); |
@@ -197,7 +199,7 @@ namespace OpenSim.Region.Environment.Modules.ModuleFramework | |||
197 | /// </summary> | 199 | /// </summary> |
198 | public class Commander : ICommander | 200 | public class Commander : ICommander |
199 | { | 201 | { |
200 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 202 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
201 | private Dictionary<string, ICommand> m_commands = new Dictionary<string, ICommand>(); | 203 | private Dictionary<string, ICommand> m_commands = new Dictionary<string, ICommand>(); |
202 | private string m_name; | 204 | private string m_name; |
203 | 205 | ||
@@ -241,7 +243,7 @@ namespace OpenSim.Region.Environment.Modules.ModuleFramework | |||
241 | classSrc += "\tpublic void " + EscapeRuntimeAPICommand(com.Name) + "( "; | 243 | classSrc += "\tpublic void " + EscapeRuntimeAPICommand(com.Name) + "( "; |
242 | foreach (KeyValuePair<string, string> arg in com.Arguments) | 244 | foreach (KeyValuePair<string, string> arg in com.Arguments) |
243 | { | 245 | { |
244 | classSrc += arg.Value + " " + Framework.Util.Md5Hash(arg.Key) + ","; | 246 | classSrc += arg.Value + " " + Util.Md5Hash(arg.Key) + ","; |
245 | } | 247 | } |
246 | classSrc = classSrc.Remove(classSrc.Length - 1); // Delete the last comma | 248 | classSrc = classSrc.Remove(classSrc.Length - 1); // Delete the last comma |
247 | classSrc += " )\n\t{\n"; | 249 | classSrc += " )\n\t{\n"; |
@@ -249,7 +251,7 @@ namespace OpenSim.Region.Environment.Modules.ModuleFramework | |||
249 | int i = 0; | 251 | int i = 0; |
250 | foreach (KeyValuePair<string, string> arg in com.Arguments) | 252 | foreach (KeyValuePair<string, string> arg in com.Arguments) |
251 | { | 253 | { |
252 | classSrc += "\t\targs[" + i.ToString() + "] = " + Framework.Util.Md5Hash(arg.Key) + " " + ";\n"; | 254 | classSrc += "\t\targs[" + i.ToString() + "] = " + Util.Md5Hash(arg.Key) + " " + ";\n"; |
253 | i++; | 255 | i++; |
254 | } | 256 | } |
255 | classSrc += "\t\tGetCommander(\"" + m_name + "\").Run(\"" + com.Name + "\", args);\n"; | 257 | classSrc += "\t\tGetCommander(\"" + m_name + "\").Run(\"" + com.Name + "\", args);\n"; |