From eb6cca4750e1fff2c1d8e0be93564b5f122571d9 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 19 Dec 2008 19:07:11 +0000 Subject: [PATCH] * refactor: Rename IRegionSerialiser and move into interfaces namespace --- .../IRegionSerialiserModule.cs} | 4 ++-- .../ContentManagementSystem/FileSystemDatabase.cs | 6 ++---- .../Modules/World/Archiver/ArchiveReadRequest.cs | 12 ++++++------ .../World/Archiver/ArchiveWriteRequestExecution.cs | 4 ++-- .../World/Archiver/ArchiveWriteRequestPreparation.cs | 2 +- .../Modules/World/Serialiser/SerialiserModule.cs | 4 ++-- OpenSim/Region/Environment/Scenes/Scene.cs | 4 ++-- .../Region/Modules/SvnSerialiser/SvnBackupModule.cs | 4 ++-- 8 files changed, 19 insertions(+), 21 deletions(-) rename OpenSim/Region/Environment/{Modules/World/Serialiser/IRegionSerialiser.cs => Interfaces/IRegionSerialiserModule.cs} (98%) diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs b/OpenSim/Region/Environment/Interfaces/IRegionSerialiserModule.cs similarity index 98% rename from OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs rename to OpenSim/Region/Environment/Interfaces/IRegionSerialiserModule.cs index bbc4acf4de..29d5d475b8 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs +++ b/OpenSim/Region/Environment/Interfaces/IRegionSerialiserModule.cs @@ -30,9 +30,9 @@ using System.Collections.Generic; using System.IO; using OpenSim.Region.Environment.Scenes; -namespace OpenSim.Region.Environment.Modules.World.Serialiser +namespace OpenSim.Region.Environment.Interfaces { - public interface IRegionSerialiser + public interface IRegionSerialiserModule { List SerialiseRegion(Scene scene, string saveDir); diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs index 607f6a9ebf..3a8e3747c3 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs @@ -69,7 +69,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement private string m_repodir = null; private Dictionary m_scenes = new Dictionary(); - private Dictionary m_serialiser = new Dictionary(); + private Dictionary m_serialiser = new Dictionary(); #endregion Fields @@ -105,9 +105,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement { foreach (UUID region in m_scenes.Keys) { - m_serialiser.Add(region, - m_scenes[region].RequestModuleInterface() - ); + m_serialiser.Add(region, m_scenes[region].RequestModuleInterface()); } } } diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs index 3cd06521a1..e04662f50d 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs @@ -25,11 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.Environment.Modules.World.Serialiser; -using OpenSim.Region.Environment.Modules.World.Terrain; -using OpenSim.Framework.Communications.Cache; using System; using System.Collections.Generic; using System.IO; @@ -39,6 +34,11 @@ using System.Xml; using System.Net; using OpenMetaverse; using log4net; +using OpenSim.Framework; +using OpenSim.Framework.Communications.Cache; +using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Environment.Modules.World.Terrain; namespace OpenSim.Region.Environment.Modules.World.Archiver { @@ -124,7 +124,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver // Reload serialized prims m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects. Please wait.", serialisedSceneObjects.Count); - IRegionSerialiser serialiser = m_scene.RequestModuleInterface(); + IRegionSerialiserModule serialiser = m_scene.RequestModuleInterface(); ICollection sceneObjects = new List(); foreach (string serialisedSceneObject in serialisedSceneObjects) diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs index 5b4d9e53be..73fa5d23e4 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs @@ -54,7 +54,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); protected ITerrainModule m_terrainModule; - protected IRegionSerialiser m_serialiser; + protected IRegionSerialiserModule m_serialiser; protected List m_sceneObjects; protected string m_sceneName; protected string m_savePath; @@ -62,7 +62,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver public ArchiveWriteRequestExecution( List sceneObjects, ITerrainModule terrainModule, - IRegionSerialiser serialiser, + IRegionSerialiserModule serialiser, string sceneName, string savePath) { diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs index bb3a18d82a..9cf6bf5813 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs @@ -287,7 +287,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver = new ArchiveWriteRequestExecution( sceneObjects, m_scene.RequestModuleInterface(), - m_scene.RequestModuleInterface(), + m_scene.RequestModuleInterface(), m_scene.RegionInfo.RegionName, m_savePath); new AssetsRequest(assetUuids.Keys, m_scene.AssetCache, awre.ReceivedAllAssets).Execute(); diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs index e3eb37748d..8b5dd2c333 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs @@ -36,7 +36,7 @@ using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.Environment.Modules.World.Serialiser { - public class SerialiserModule : IRegionModule, IRegionSerialiser + public class SerialiserModule : IRegionModule, IRegionSerialiserModule { private Commander m_commander = new Commander("Export"); private List m_regions = new List(); @@ -49,7 +49,7 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser { scene.RegisterModuleCommander("Export", m_commander); scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole; - scene.RegisterModuleInterface(this); + scene.RegisterModuleInterface(this); lock (m_regions) { diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 4272f22da0..fec89daec0 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -142,7 +142,7 @@ namespace OpenSim.Region.Environment.Scenes protected IWorldComm m_worldCommModule; protected IAvatarFactory m_AvatarFactory; protected IConfigSource m_config; - protected IRegionSerialiser m_serialiser; + protected IRegionSerialiserModule m_serialiser; // Central Update Loop @@ -728,7 +728,7 @@ namespace OpenSim.Region.Environment.Scenes m_worldCommModule = RequestModuleInterface(); XferManager = RequestModuleInterface(); m_AvatarFactory = RequestModuleInterface(); - m_serialiser = RequestModuleInterface(); + m_serialiser = RequestModuleInterface(); } #endregion diff --git a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs index b87954c06b..f90c6979d0 100644 --- a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs +++ b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs @@ -50,7 +50,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser private bool m_enabled = false; private bool m_installBackupOnLoad = false; - private IRegionSerialiser m_serialiser; + private IRegionSerialiserModule m_serialiser; private bool m_svnAutoSave = false; private SvnClient m_svnClient; private string m_svndir = "SVNmodule" + Slash.DirectorySeparatorChar + "repo"; @@ -360,7 +360,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser private void SetupSerialiser() { if (m_scenes.Count > 0) - m_serialiser = m_scenes[0].RequestModuleInterface(); + m_serialiser = m_scenes[0].RequestModuleInterface(); } private void SetupSvnProvider()