From 9377c6f2b28c75a093fa554d64e0d63e6bdf2fa5 Mon Sep 17 00:00:00 2001 From: Mike Mazur Date: Tue, 3 Feb 2009 05:20:26 +0000 Subject: - move OpenSim/Framework/IInventoryData.cs to OpenSim/Data/IInventoryData.cs - trim trailing whitespace --- OpenSim/Data/IInventoryData.cs | 157 +++++++++++++++++++++++++++++++ OpenSim/Data/Tests/BasicInventoryTest.cs | 20 ++-- 2 files changed, 167 insertions(+), 10 deletions(-) create mode 100644 OpenSim/Data/IInventoryData.cs (limited to 'OpenSim/Data') diff --git a/OpenSim/Data/IInventoryData.cs b/OpenSim/Data/IInventoryData.cs new file mode 100644 index 0000000..03b1cbe --- /dev/null +++ b/OpenSim/Data/IInventoryData.cs @@ -0,0 +1,157 @@ +/* + * 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 System.Collections.Generic; +using OpenMetaverse; +using OpenSim.Framework; + +namespace OpenSim.Data +{ + /// + /// An interface for accessing inventory data from a storage server + /// + public interface IInventoryDataPlugin : IPlugin + { + /// + /// Initialises the interface + /// + void Initialise(string connect); + + /// + /// Returns all descendent folders of this folder. Does not return the parent folder itself. + /// + /// The folder to get subfolders for + /// A list of inventory folders + List getFolderHierarchy(UUID parentID); + + /// + /// Returns a list of inventory items contained within the specified folder + /// + /// The UUID of the target folder + /// A List of InventoryItemBase items + List getInventoryInFolder(UUID folderID); + + /// + /// Returns a list of the root folders within a users inventory + /// + /// The user whos inventory is to be searched + /// A list of folder objects + List getUserRootFolders(UUID user); + + /// + /// Returns the users inventory root folder. + /// + /// The UUID of the user who is having inventory being returned + /// Root inventory folder, null if no root inventory folder was found + InventoryFolderBase getUserRootFolder(UUID user); + + /// + /// Returns a list of inventory folders contained in the folder 'parentID' + /// + /// The folder to get subfolders for + /// A list of inventory folders + List getInventoryFolders(UUID parentID); + + /// + /// Returns an inventory item by its UUID + /// + /// The UUID of the item to be returned + /// A class containing item information + InventoryItemBase getInventoryItem(UUID item); + + /// + /// Returns a specified inventory folder by its UUID + /// + /// The UUID of the folder to be returned + /// A class containing folder information + InventoryFolderBase getInventoryFolder(UUID folder); + + /// + /// Creates a new inventory item based on item + /// + /// The item to be created + void addInventoryItem(InventoryItemBase item); + + /// + /// Updates an inventory item with item (updates based on ID) + /// + /// The updated item + void updateInventoryItem(InventoryItemBase item); + + /// + /// + /// + /// + void deleteInventoryItem(UUID item); + + /// + /// Adds a new folder specified by folder + /// + /// The inventory folder + void addInventoryFolder(InventoryFolderBase folder); + + /// + /// Updates a folder based on its ID with folder + /// + /// The inventory folder + void updateInventoryFolder(InventoryFolderBase folder); + + /// + /// Updates a folder based on its ID with folder + /// + /// The inventory folder + void moveInventoryFolder(InventoryFolderBase folder); + + /// + /// Deletes a folder. Thie will delete both the folder itself and its contents (items and descendent folders) + /// + /// The id of the folder + void deleteInventoryFolder(UUID folder); + + /// + /// Returns all activated gesture-items in the inventory of the specified avatar. + /// + /// + /// The of the avatar + /// + /// + /// The list of gestures (s) + /// + List fetchActiveGestures(UUID avatarID); + } + + public class InventoryDataInitialiser : PluginInitialiserBase + { + private string connect; + public InventoryDataInitialiser (string s) { connect = s; } + public override void Initialise (IPlugin plugin) + { + IInventoryDataPlugin p = plugin as IInventoryDataPlugin; + p.Initialise (connect); + } + } +} diff --git a/OpenSim/Data/Tests/BasicInventoryTest.cs b/OpenSim/Data/Tests/BasicInventoryTest.cs index ea8e4e8..2e6226f 100644 --- a/OpenSim/Data/Tests/BasicInventoryTest.cs +++ b/OpenSim/Data/Tests/BasicInventoryTest.cs @@ -94,9 +94,9 @@ namespace OpenSim.Data.Tests iname1 = "Shirt"; iname2 = "Text Board"; iname3 = "No Pants Barrel"; - + } - + [Test] public void T001_LoadEmpty() { @@ -163,7 +163,7 @@ namespace OpenSim.Data.Tests { InventoryFolderBase f2 = NewFolder(folder3, folder1, owner1, name3); db.addInventoryFolder(f2); - + Assert.That(db.getInventoryFolders(zero).Count, Is.EqualTo(1)); Assert.That(db.getInventoryFolders(folder1).Count, Is.EqualTo(2)); Assert.That(db.getInventoryFolders(folder2).Count, Is.EqualTo(0)); @@ -171,7 +171,7 @@ namespace OpenSim.Data.Tests Assert.That(db.getInventoryFolders(UUID.Random()).Count, Is.EqualTo(0)); } - + [Test] public void T013_FolderHierarchy() { @@ -182,14 +182,14 @@ namespace OpenSim.Data.Tests Assert.That(db.getFolderHierarchy(UUID.Random()).Count, Is.EqualTo(0)); } - + [Test] public void T014_MoveFolder() { InventoryFolderBase f2 = db.getInventoryFolder(folder2); f2.ParentID = folder3; db.moveInventoryFolder(f2); - + Assert.That(db.getInventoryFolders(zero).Count, Is.EqualTo(1)); Assert.That(db.getInventoryFolders(folder1).Count, Is.EqualTo(1)); Assert.That(db.getInventoryFolders(folder2).Count, Is.EqualTo(0)); @@ -228,7 +228,7 @@ namespace OpenSim.Data.Tests db.addInventoryItem(NewItem(item3, folder3, owner1, iname3, asset3)); Assert.That(db.getInventoryInFolder(folder3).Count, Is.EqualTo(3)); } - + [Test] public void T102_CompareItems() { @@ -245,7 +245,7 @@ namespace OpenSim.Data.Tests Assert.That(i2.AssetID, Is.EqualTo(asset2)); Assert.That(i3.AssetID, Is.EqualTo(asset3)); } - + [Test] public void T103UpdateItem() { @@ -257,7 +257,7 @@ namespace OpenSim.Data.Tests i1.Description = niname1; i1.Owner = owner2; db.updateInventoryItem(i1); - + i1 = db.getInventoryItem(item1); Assert.That(i1.Name, Is.EqualTo(niname1)); Assert.That(i1.Description, Is.EqualTo(niname1)); @@ -287,4 +287,4 @@ namespace OpenSim.Data.Tests return f; } } -} \ No newline at end of file +} -- cgit v1.1