From ee205e7e812e170f670e690a4e0fa9caa652f226 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 1 Oct 2009 01:00:09 +0900 Subject: Formatting cleanup. --- .../Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 8 ++++---- .../World/Archiver/ArchiveWriteRequestPreparation.cs | 6 +++--- OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | 10 +++++----- OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs | 2 +- OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | 12 ++++++------ .../Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 10 +++++----- 6 files changed, 24 insertions(+), 24 deletions(-) (limited to 'OpenSim/Region/CoreModules/World/Archiver') diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 376ea8a..65f83fd 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs @@ -110,12 +110,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver TarArchiveReader.TarEntryType entryType; while ((data = archive.ReadEntry(out filePath, out entryType)) != null) - { + { //m_log.DebugFormat( // "[ARCHIVER]: Successfully read {0} ({1} bytes)", filePath, data.Length); if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType) - continue; + continue; if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH)) { @@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects. Please wait.", serialisedSceneObjects.Count); IRegionSerialiserModule serialiser = m_scene.RequestModuleInterface(); - int sceneObjectsLoadedCount = 0; + int sceneObjectsLoadedCount = 0; foreach (string serialisedSceneObject in serialisedSceneObjects) { @@ -499,7 +499,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None); XmlTextReader xtr - = new XmlTextReader(m_asciiEncoding.GetString(data), XmlNodeType.Document, context); + = new XmlTextReader(m_asciiEncoding.GetString(data), XmlNodeType.Document, context); RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings; diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs index 63608a8..9e4fbbe 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs @@ -74,14 +74,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_scene = scene; m_saveStream = saveStream; m_requestId = requestId; - } + } /// /// Archive the region requested. /// /// if there was an io problem with creating the file public void ArchiveRegion() - { + { Dictionary assetUuids = new Dictionary(); List entities = m_scene.GetEntities(); @@ -137,7 +137,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_scene.RequestModuleInterface(), m_scene, archiveWriter, - m_requestId); + m_requestId); new AssetsRequest( new AssetsArchiver(archiveWriter), assetUuids.Keys, diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs index 5c58b69..8d4f91b 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs @@ -78,7 +78,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver public void Close() { - } + } public void ArchiveRegion(string savePath) { @@ -90,7 +90,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_log.InfoFormat( "[ARCHIVER]: Writing archive for region {0} to {1}", m_scene.RegionInfo.RegionName, savePath); - new ArchiveWriteRequestPreparation(m_scene, savePath, requestId).ArchiveRegion(); + new ArchiveWriteRequestPreparation(m_scene, savePath, requestId).ArchiveRegion(); } public void ArchiveRegion(Stream saveStream) @@ -101,7 +101,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver public void ArchiveRegion(Stream saveStream, Guid requestId) { new ArchiveWriteRequestPreparation(m_scene, saveStream, requestId).ArchiveRegion(); - } + } public void DearchiveRegion(string loadPath) { @@ -114,7 +114,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver "[ARCHIVER]: Loading archive to region {0} from {1}", m_scene.RegionInfo.RegionName, loadPath); new ArchiveReadRequest(m_scene, loadPath, merge, requestId).DearchiveRegion(); - } + } public void DearchiveRegion(Stream loadStream) { @@ -124,6 +124,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver public void DearchiveRegion(Stream loadStream, bool merge, Guid requestId) { new ArchiveReadRequest(m_scene, loadStream, merge, requestId).DearchiveRegion(); - } + } } } diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs index 330fa3f..95d109c 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs @@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver /// /// public void WriteAsset(AssetBase asset) - { + { //WriteMetadata(archive); WriteData(asset); } diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs index 82803bf..fe9c8d9 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs @@ -115,7 +115,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_requestCallbackTimer = new System.Timers.Timer(TIMEOUT); m_requestCallbackTimer.AutoReset = false; - m_requestCallbackTimer.Elapsed += new ElapsedEventHandler(OnRequestCallbackTimeout); + m_requestCallbackTimer.Elapsed += new ElapsedEventHandler(OnRequestCallbackTimeout); } protected internal void Execute() @@ -143,7 +143,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver protected void OnRequestCallbackTimeout(object source, ElapsedEventArgs args) { try - { + { lock (this) { // Take care of the possibilty that this thread started but was paused just outside the lock before @@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver } // Calculate which uuids were not found. This is an expensive way of doing it, but this is a failure - // case anyway. + // case anyway. List uuids = new List(); foreach (UUID uuid in m_uuids) { @@ -188,7 +188,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_log.ErrorFormat( "[ARCHIVER]: (... {0} more not shown)", uuids.Count - MAX_UUID_DISPLAY_ON_TIMEOUT); - m_log.Error("[ARCHIVER]: OAR save aborted."); + m_log.Error("[ARCHIVER]: OAR save aborted."); } catch (Exception e) { @@ -213,7 +213,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver { //m_log.DebugFormat("[ARCHIVER]: Received callback for asset {0}", id); - m_requestCallbackTimer.Stop(); + m_requestCallbackTimer.Stop(); if (m_requestState == RequestState.Aborted) { @@ -258,7 +258,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver } catch (Exception e) { - m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e); + m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e); } } diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index 5c42e94..edac4a4 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs @@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests m_lastErrorMessage = errorMessage; Console.WriteLine("About to pulse ArchiverTests on LoadCompleted"); - Monitor.PulseAll(this); + Monitor.PulseAll(this); } } @@ -138,7 +138,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests archiverModule.ArchiveRegion(archiveWriteStream, requestId); //AssetServerBase assetServer = (AssetServerBase)scene.CommsManager.AssetCache.AssetServer; //while (assetServer.HasWaitingRequests()) - // assetServer.ProcessNextRequest(); + // assetServer.ProcessNextRequest(); Monitor.Wait(this, 60000); } @@ -213,7 +213,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests // Also check that direct entries which will also have a file entry containing that directory doesn't // upset load - tar.WriteDir(ArchiveConstants.TERRAINS_PATH); + tar.WriteDir(ArchiveConstants.TERRAINS_PATH); tar.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, ArchiveWriteRequestExecution.Create0p2ControlFile()); @@ -251,7 +251,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests { scene.EventManager.OnOarFileLoaded += LoadCompleted; archiverModule.DearchiveRegion(archiveReadStream); - } + } Assert.That(m_lastErrorMessage, Is.Null); @@ -271,7 +271,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests /// /// Test merging a V0.2 OpenSim Region Archive into an existing scene - /// + /// //[Test] public void TestMergeOarV0_2() { -- cgit v1.1