mirror of
https://github.com/opensim/opensim.git
synced 2026-08-01 14:16:07 +08:00
Refactoring: Moved component creation to "ComponentFactory" as dictated by convention
This commit is contained in:
@@ -26,11 +26,7 @@
|
||||
*/
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using OpenSim.ScriptEngine.Shared;
|
||||
using log4net;
|
||||
|
||||
namespace OpenSim.ApplicationPlugins.ScriptEngine
|
||||
@@ -43,10 +39,6 @@ namespace OpenSim.ApplicationPlugins.ScriptEngine
|
||||
internal static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||
internal OpenSimBase m_OpenSim;
|
||||
|
||||
// Component providers are registered here wit a name (string)
|
||||
// When a script engine is created the components are instanciated
|
||||
public static Dictionary<string, Type> providers = new Dictionary<string, Type>();
|
||||
public static Dictionary<string, Type> scriptEngines = new Dictionary<string, Type>();
|
||||
|
||||
|
||||
public ScriptEnginePlugin()
|
||||
@@ -62,7 +54,7 @@ namespace OpenSim.ApplicationPlugins.ScriptEngine
|
||||
|
||||
// Load all modules from current directory
|
||||
// We only want files named OpenSim.ScriptEngine.*.dll
|
||||
Load(".", "OpenSim.ScriptEngine.*.dll");
|
||||
ComponentFactory.Load(".", "OpenSim.ScriptEngine.*.dll");
|
||||
}
|
||||
|
||||
public void Initialise(OpenSimBase openSim)
|
||||
@@ -73,95 +65,6 @@ namespace OpenSim.ApplicationPlugins.ScriptEngine
|
||||
//m_OpenSim.Shutdown();
|
||||
}
|
||||
|
||||
private readonly static string nameIScriptEngineComponent = typeof(IScriptEngineComponent).Name; // keep interface name in managed code
|
||||
private readonly static string nameIScriptEngine = typeof(IScriptEngine).Name; // keep interface name in managed code
|
||||
/// <summary>
|
||||
/// Load components from directory
|
||||
/// </summary>
|
||||
/// <param name="directory"></param>
|
||||
public void Load(string directory, string filter)
|
||||
{
|
||||
// We may want to change how this functions as currently it required unique class names for each component
|
||||
|
||||
foreach (string file in Directory.GetFiles(directory, filter))
|
||||
{
|
||||
//m_log.DebugFormat("[ScriptEngine]: Loading: [{0}].", file);
|
||||
Assembly componentAssembly = null;
|
||||
try
|
||||
{
|
||||
componentAssembly = Assembly.LoadFrom(file);
|
||||
} catch (Exception e)
|
||||
{
|
||||
m_log.ErrorFormat("[{0}] Error loading: \"{1}\".", Name, file);
|
||||
}
|
||||
if (componentAssembly != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
// Go through all types in the assembly
|
||||
foreach (Type componentType in componentAssembly.GetTypes())
|
||||
{
|
||||
if (componentType.IsPublic
|
||||
&& !componentType.IsAbstract)
|
||||
{
|
||||
//if (componentType.IsSubclassOf(typeof(ComponentBase)))
|
||||
if (componentType.GetInterface(nameIScriptEngineComponent) != null)
|
||||
{
|
||||
// We have found an type which is derived from ProdiverBase, add it to provider list
|
||||
m_log.InfoFormat("[{0}] Adding component: {1}", Name, componentType.Name);
|
||||
lock (providers)
|
||||
{
|
||||
providers.Add(componentType.Name, componentType);
|
||||
}
|
||||
}
|
||||
//if (componentType.IsSubclassOf(typeof(ScriptEngineBase)))
|
||||
if (componentType.GetInterface(nameIScriptEngine) != null)
|
||||
{
|
||||
// We have found an type which is derived from RegionScriptEngineBase, add it to engine list
|
||||
m_log.InfoFormat("[{0}] Adding script engine: {1}", Name, componentType.Name);
|
||||
lock (scriptEngines)
|
||||
{
|
||||
scriptEngines.Add(componentType.Name, componentType);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch
|
||||
(ReflectionTypeLoadException re)
|
||||
{
|
||||
m_log.ErrorFormat("[{0}] Could not load component \"{1}\": {2}", Name, componentAssembly.FullName, re.ToString());
|
||||
int c = 0;
|
||||
foreach (Exception e in re.LoaderExceptions)
|
||||
{
|
||||
c++;
|
||||
m_log.ErrorFormat("[{0}] LoaderException {1}: {2}", Name, c, e.ToString());
|
||||
}
|
||||
}
|
||||
} //if
|
||||
} //foreach
|
||||
}
|
||||
|
||||
public static IScriptEngineComponent GetComponentInstance(string name, params Object[] args)
|
||||
{
|
||||
if (!providers.ContainsKey(name))
|
||||
throw new Exception("ScriptEngine requested component named \"" + name +
|
||||
"\" that does not exist.");
|
||||
|
||||
return Activator.CreateInstance(providers[name], args) as IScriptEngineComponent;
|
||||
}
|
||||
|
||||
private readonly static string nameIScriptEngineRegionComponent = typeof(IScriptEngineRegionComponent).Name; // keep interface name in managed code
|
||||
public static IScriptEngineComponent GetComponentInstance(RegionInfoStructure info, string name, params Object[] args)
|
||||
{
|
||||
IScriptEngineComponent c = GetComponentInstance(name, args);
|
||||
|
||||
// If module is IScriptEngineRegionComponent then it will have one instance per region and we will initialize it
|
||||
if (c.GetType().GetInterface(nameIScriptEngineRegionComponent) != null)
|
||||
((IScriptEngineRegionComponent)c).Initialize(info);
|
||||
|
||||
return c;
|
||||
}
|
||||
|
||||
#region IApplicationPlugin stuff
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user