From eb6cca4750e1fff2c1d8e0be93564b5f122571d9 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 19 Dec 2008 19:07:11 +0000 Subject: * refactor: Rename IRegionSerialiser and move into interfaces namespace --- .../ContentManagementSystem/FileSystemDatabase.cs | 6 +- .../Modules/World/Archiver/ArchiveReadRequest.cs | 12 +-- .../World/Archiver/ArchiveWriteRequestExecution.cs | 4 +- .../Archiver/ArchiveWriteRequestPreparation.cs | 2 +- .../Modules/World/Serialiser/IRegionSerialiser.cs | 120 --------------------- .../Modules/World/Serialiser/SerialiserModule.cs | 4 +- 6 files changed, 13 insertions(+), 135 deletions(-) delete mode 100644 OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs (limited to 'OpenSim/Region/Environment/Modules') diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs index 607f6a9..3a8e374 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 3cd0652..e04662f 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 5b4d9e5..73fa5d2 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 bb3a18d..9cf6bf5 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/IRegionSerialiser.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs deleted file mode 100644 index bbc4acf..0000000 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSim Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using OpenMetaverse; -using System.Collections.Generic; -using System.IO; -using OpenSim.Region.Environment.Scenes; - -namespace OpenSim.Region.Environment.Modules.World.Serialiser -{ - public interface IRegionSerialiser - { - List SerialiseRegion(Scene scene, string saveDir); - - /// - /// Load prims from the xml format - /// - /// - /// - /// - /// - void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, Vector3 loadOffset); - - /// - /// Save prims in the xml format - /// - /// - /// - void SavePrimsToXml(Scene scene, string fileName); - - /// - /// Load prims from the xml2 format - /// - /// - /// - void LoadPrimsFromXml2(Scene scene, string fileName); - - /// - /// Load prims from the xml2 format - /// - /// - /// - /// - void LoadPrimsFromXml2(Scene scene, TextReader reader, bool startScripts); - - /// - /// Save prims in the xml2 format - /// - /// - /// - void SavePrimsToXml2(Scene scene, string fileName); - - /// - /// Save prims in the xml2 format, optionally specifying a bounding box for which - /// prims should be saved. If both min and max vectors are Vector3.Zero, then all prims - /// are exported. - /// - /// - /// - /// - /// - void SavePrimsToXml2(Scene scene, TextWriter stream, Vector3 min, Vector3 max); - - /// - /// Save a set of prims in the xml2 format - /// - /// - /// - void SavePrimListToXml2(List entityList, string fileName); - - /// - /// Save a set of prims in the xml2 format, optionally specifying a bounding box for which - /// prims should be saved. If both min and max vectors are Vector3.Zero, then all prims - /// are exported. - /// - /// - /// - /// - /// - void SavePrimListToXml2(List entityList, TextWriter stream, Vector3 min, Vector3 max); - - /// - /// Deserializes a scene object from its xml2 representation. This does not load the object into the scene. - /// - /// - /// The scene object created. null if the scene object already existed - SceneObjectGroup DeserializeGroupFromXml2(string xmlString); - - /// - /// Serialize an individual scene object into the xml2 format - /// - /// - /// - string SaveGroupToXml2(SceneObjectGroup grp); - } -} diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs index e3eb377..8b5dd2c 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) { -- cgit v1.1