[Nmailserver-commits] SF.net SVN: nmailserver: [171] NMail/trunk/NMail

[<tmy...@us...>]

Revision: 171
          http://svn.sourceforge.net/nmailserver/?rev=171&view=rev
Author:   tmyroadctfig
Date:     2007-03-08 01:45:38 -0800 (Thu, 08 Mar 2007)

Log Message:
-----------
Added owner to StoreFolder.

Modified Paths:
--------------
    NMail/trunk/NMail/DataTypes/LocalStore/StoreFolder.cs
    NMail/trunk/NMail.LocalStoreData.MySql/MySqlLocalStore.sql
    NMail/trunk/NMail.LocalStoreData.MySql/MySqlLocalStoreData.cs
    NMail/trunk/NMail.RemoteAccessService.Serializers/DataTypes/LocalStore/StoreFolderSerializer.cs

Modified: NMail/trunk/NMail/DataTypes/LocalStore/StoreFolder.cs
===================================================================
--- NMail/trunk/NMail/DataTypes/LocalStore/StoreFolder.cs	2007-03-08 09:43:35 UTC (rev 170)
+++ NMail/trunk/NMail/DataTypes/LocalStore/StoreFolder.cs	2007-03-08 09:45:38 UTC (rev 171)
@@ -16,6 +16,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 
 using NMail.Configuration;
 using NMail.DataTypes;
@@ -25,17 +26,24 @@
 	/// A folder that has been obtained from the local store.
 	/// </summary>
 	[Serializable]
-	public class StoreFolder : Folder {	
+	public class StoreFolder : Folder {
 		/// <summary>
 		/// Creates a new store folder.
 		/// </summary>
+		public StoreFolder() : base() { }
+
+		/// <summary>
+		/// Creates a new store folder.
+		/// </summary>
 		/// <param name="newFolder">The folder name.</param>
 		/// <param name="folderId">The folder Id.</param>
 		/// <param name="parentId">The Id of this folder's parent or null if non.</param>
+		/// <param name="ownerUserId">The user that owns this folder.</param>
 		/// <param name="hasChildren">A flag indicating if this folder has subfolder.s</param>
-		public StoreFolder(string newFolder, int folderId, int? parentId, bool hasChildren) : base(newFolder) {
+		public StoreFolder(string newFolder, int folderId, int? parentId, int ownerUserId, bool hasChildren) : base(newFolder) {
 			this.folderId = folderId;
 			this.parentId = parentId;
+			this.ownerUserId = ownerUserId;
 			this.hasChildren = hasChildren;
 		}
 
@@ -46,10 +54,12 @@
 		/// <param name="newFolder">The folder name.</param>
 		/// <param name="folderId">The folder Id.</param>
 		/// <param name="parentId">The Id of this folder's parent or null if non.</param>
+		/// <param name="ownerUserId">The user that owns this folder.</param>
 		/// <param name="hasChildren">A flag indicating if this folder has subfolder.s</param>
-		public StoreFolder(string newNameSpace, string newFolder, int folderId, int? parentId, bool hasChildren) : base(newNameSpace, newFolder) {
+		public StoreFolder(string newNameSpace, string newFolder, int folderId, int? parentId, int ownerUserId, bool hasChildren) : base(newNameSpace, newFolder) {
 			this.folderId = folderId;
 			this.parentId = parentId;
+			this.ownerUserId = ownerUserId;
 			this.hasChildren = hasChildren;
 		}
 
@@ -80,6 +90,16 @@
 				this.parentId = value;
 			}
 		}
+
+		private int ownerUserId;
+
+		/// <summary>
+		/// The user that owns this folder.
+		/// </summary>
+		public int OwnerUserId {
+			get { return ownerUserId; }
+			set { ownerUserId = value; }
+		}
 	
 		private bool hasChildren;
 
@@ -94,5 +114,12 @@
 				this.hasChildren = value;
 			}
 		}
+
+		private IList<int> childrenIds;
+
+		public IList<int> ChildrenIds {
+			get { return childrenIds; }
+			set { childrenIds = value; }
+		}	
 	}
 }

Modified: NMail/trunk/NMail.LocalStoreData.MySql/MySqlLocalStore.sql
===================================================================
--- NMail/trunk/NMail.LocalStoreData.MySql/MySqlLocalStore.sql	2007-03-08 09:43:35 UTC (rev 170)
+++ NMail/trunk/NMail.LocalStoreData.MySql/MySqlLocalStore.sql	2007-03-08 09:45:38 UTC (rev 171)
@@ -275,7 +275,7 @@
 BEGIN
 
 	SELECT
-		f.FolderId, f.Name, f.ParentFolderId, n.Name AS NameSpace
+		f.FolderId, f.Name, f.ParentFolderId, f.OwnerUserId, n.Name AS NameSpace
 	FROM
 		Folder f, Namespace n
 	WHERE

Modified: NMail/trunk/NMail.LocalStoreData.MySql/MySqlLocalStoreData.cs
===================================================================
--- NMail/trunk/NMail.LocalStoreData.MySql/MySqlLocalStoreData.cs	2007-03-08 09:43:35 UTC (rev 170)
+++ NMail/trunk/NMail.LocalStoreData.MySql/MySqlLocalStoreData.cs	2007-03-08 09:45:38 UTC (rev 171)
@@ -214,11 +214,13 @@
 					cmd.CommandText = "GetFolder";
 					cmd.Parameters.Add("?FolderId", folderId);
 					cmd.Parameters.Add("?ParentId", MySqlDbType.Int32);
+					cmd.Parameters.Add("?OwnerUserId", MySqlDbType.Int32);
 					cmd.Parameters.Add("?Name", MySqlDbType.VarChar);
 					cmd.Parameters.Add("?NameSpace", MySqlDbType.VarChar);
 					cmd.Parameters.Add("?Children", MySqlDbType.Int32);
 					cmd.Parameters.Add("?Result", MySqlDbType.Int32);
 					cmd.Parameters["ParentId"].Direction = ParameterDirection.Output;
+					cmd.Parameters["OwnerUserId"].Direction = ParameterDirection.Output;
 					cmd.Parameters["Name"].Direction = ParameterDirection.Output;
 					cmd.Parameters["NameSpace"].Direction = ParameterDirection.Output;
 					cmd.Parameters["Children"].Direction = ParameterDirection.Output;
@@ -241,12 +243,14 @@
 					int? parentId = (cmd.Parameters["ParentId"].Value == DBNull.Value)
 						? null
 						: (int?) cmd.Parameters["ParentId"].Value;
+					int ownerUserId = (int) cmd.Parameters["OwnerUserId"].Value;
 
 					// Return the folder object
 					return new StoreFolder(nameSpace,
 						name,
 						folderId,
 						parentId,
+						ownerUserId,
 						(children != 0));
 				}
 			}
@@ -417,9 +421,10 @@
 						int? parentId = (reader["ParentFolderId"] == DBNull.Value)
 							? null
 							: (int?) reader["ParentFolderId"];
+						int ownerUserId = (int) reader["OwnerUserId"];
 
 						// TODO: Get HasChildren from the reader
-						folders.Add(new StoreFolder(nameSpace, name, folderId, parentId, false));
+						folders.Add(new StoreFolder(nameSpace, name, folderId, parentId, ownerUserId, false));
 					}
 
 					return folders.ToArray();
@@ -1151,7 +1156,7 @@
 							: (int?) reader["ParentFolderId"];
 
 						// TODO: Get HasChildren from the reader
-						folders.Add(new StoreFolder(nameSpace, name, folderId, parentId, false));
+						folders.Add(new StoreFolder(nameSpace, name, folderId, parentId, userId, false));
 					}
 
 					return folders.ToArray(); 

Modified: NMail/trunk/NMail.RemoteAccessService.Serializers/DataTypes/LocalStore/StoreFolderSerializer.cs
===================================================================
--- NMail/trunk/NMail.RemoteAccessService.Serializers/DataTypes/LocalStore/StoreFolderSerializer.cs	2007-03-08 09:43:35 UTC (rev 170)
+++ NMail/trunk/NMail.RemoteAccessService.Serializers/DataTypes/LocalStore/StoreFolderSerializer.cs	2007-03-08 09:45:38 UTC (rev 171)
@@ -22,6 +22,7 @@
 			this.nameSpace = storeFolder.NameSpace;
 			this.hasChildren = storeFolder.HasChildren;
 			this.parentId = storeFolder.ParentId;
+			this.ownerUserId = storeFolder.OwnerUserId;
 		}
 
 		private int folderId;
@@ -63,9 +64,16 @@
 			get { return parentId;}
 			set { parentId = value;}
 		}
+
+		private int ownerUserId;
+
+		public int OwnerUserId {
+			get { return ownerUserId; }
+			set { ownerUserId = value; }
+		}	
 	
 		public StoreFolder GetStoreFolder() {
-			return new StoreFolder(this.nameSpace, this.name, this.folderId, this.parentId, this.hasChildren);
+			return new StoreFolder(this.nameSpace, this.name, this.folderId, this.parentId, this.ownerUserId, this.hasChildren);
 		}
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.