diff options
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs index d7de9d6..61cfc1a 100644 --- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs +++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs | |||
@@ -37,19 +37,19 @@ namespace OpenSim.Framework.Communications.Cache | |||
37 | public class InventoryFolderImpl : InventoryFolderBase | 37 | public class InventoryFolderImpl : InventoryFolderBase |
38 | { | 38 | { |
39 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
40 | 40 | ||
41 | public static readonly string PATH_DELIMITER = "/"; | 41 | public static readonly string PATH_DELIMITER = "/"; |
42 | 42 | ||
43 | /// <summary> | 43 | /// <summary> |
44 | /// Items that are contained in this folder | 44 | /// Items that are contained in this folder |
45 | /// </summary> | 45 | /// </summary> |
46 | public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>(); | 46 | public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>(); |
47 | 47 | ||
48 | /// <summary> | 48 | /// <summary> |
49 | /// Child folders that are contained in this folder | 49 | /// Child folders that are contained in this folder |
50 | /// </summary> | 50 | /// </summary> |
51 | public Dictionary<LLUUID, InventoryFolderImpl> SubFolders = new Dictionary<LLUUID, InventoryFolderImpl>(); | 51 | public Dictionary<LLUUID, InventoryFolderImpl> SubFolders = new Dictionary<LLUUID, InventoryFolderImpl>(); |
52 | 52 | ||
53 | // Constructors | 53 | // Constructors |
54 | public InventoryFolderImpl(InventoryFolderBase folderbase) | 54 | public InventoryFolderImpl(InventoryFolderBase folderbase) |
55 | { | 55 | { |
@@ -195,15 +195,15 @@ namespace OpenSim.Framework.Communications.Cache | |||
195 | 195 | ||
196 | return null; | 196 | return null; |
197 | } | 197 | } |
198 | 198 | ||
199 | /// <summary> | 199 | /// <summary> |
200 | /// Find a folder given a PATH_DELIMITOR delimited path starting from this folder | 200 | /// Find a folder given a PATH_DELIMITOR delimited path starting from this folder |
201 | /// | 201 | /// |
202 | /// This method does not handle paths that contain multiple delimitors | 202 | /// This method does not handle paths that contain multiple delimitors |
203 | /// | 203 | /// |
204 | /// FIXME: We do not yet handle situations where folders have the same name. We could handle this by some | 204 | /// FIXME: We do not yet handle situations where folders have the same name. We could handle this by some |
205 | /// XPath like expression | 205 | /// XPath like expression |
206 | /// | 206 | /// |
207 | /// FIXME: Delimitors which occur in names themselves are not currently escapable. | 207 | /// FIXME: Delimitors which occur in names themselves are not currently escapable. |
208 | /// </summary> | 208 | /// </summary> |
209 | /// <param name="path"> | 209 | /// <param name="path"> |
@@ -214,7 +214,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
214 | { | 214 | { |
215 | if (path == string.Empty) | 215 | if (path == string.Empty) |
216 | return this; | 216 | return this; |
217 | 217 | ||
218 | string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None); | 218 | string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None); |
219 | 219 | ||
220 | lock (SubFolders) | 220 | lock (SubFolders) |
@@ -228,19 +228,19 @@ namespace OpenSim.Framework.Communications.Cache | |||
228 | return folder; | 228 | return folder; |
229 | } | 229 | } |
230 | } | 230 | } |
231 | 231 | ||
232 | // We didn't find a folder with the given name | 232 | // We didn't find a folder with the given name |
233 | return null; | 233 | return null; |
234 | } | 234 | } |
235 | 235 | ||
236 | /// <summary> | 236 | /// <summary> |
237 | /// Find an item given a PATH_DELIMITOR delimited path starting from this folder. | 237 | /// Find an item given a PATH_DELIMITOR delimited path starting from this folder. |
238 | /// | 238 | /// |
239 | /// This method does not handle paths that contain multiple delimitors | 239 | /// This method does not handle paths that contain multiple delimitors |
240 | /// | 240 | /// |
241 | /// FIXME: We do not yet handle situations where folders or items have the same name. We could handle this by some | 241 | /// FIXME: We do not yet handle situations where folders or items have the same name. We could handle this by some |
242 | /// XPath like expression | 242 | /// XPath like expression |
243 | /// | 243 | /// |
244 | /// FIXME: Delimitors which occur in names themselves are not currently escapable. | 244 | /// FIXME: Delimitors which occur in names themselves are not currently escapable. |
245 | /// </summary> | 245 | /// </summary> |
246 | /// <param name="path"> | 246 | /// <param name="path"> |
@@ -248,7 +248,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
248 | /// </param> | 248 | /// </param> |
249 | /// <returns>null if the item is not found</returns> | 249 | /// <returns>null if the item is not found</returns> |
250 | public InventoryItemBase FindItemByPath(string path) | 250 | public InventoryItemBase FindItemByPath(string path) |
251 | { | 251 | { |
252 | string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None); | 252 | string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None); |
253 | 253 | ||
254 | if (components.Length == 1) | 254 | if (components.Length == 1) |
@@ -263,7 +263,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
263 | } | 263 | } |
264 | } | 264 | } |
265 | else | 265 | else |
266 | { | 266 | { |
267 | lock (SubFolders) | 267 | lock (SubFolders) |
268 | { | 268 | { |
269 | foreach (InventoryFolderImpl folder in SubFolders.Values) | 269 | foreach (InventoryFolderImpl folder in SubFolders.Values) |
@@ -273,10 +273,10 @@ namespace OpenSim.Framework.Communications.Cache | |||
273 | } | 273 | } |
274 | } | 274 | } |
275 | } | 275 | } |
276 | 276 | ||
277 | // We didn't find an item or intermediate folder with the given name | 277 | // We didn't find an item or intermediate folder with the given name |
278 | return null; | 278 | return null; |
279 | } | 279 | } |
280 | 280 | ||
281 | /// <summary> | 281 | /// <summary> |
282 | /// Return a copy of the list of child items in this folder | 282 | /// Return a copy of the list of child items in this folder |