Write folder parent functions.

mailnews/base/util/nsMsgFolder.cpp

@@ -48,7 +48,8 @@ nsMsgFolder::nsMsgFolder(void)
 		mListeners(nsnull),
     mCsid(0),
     mDepth(0), 
-    mPrefFlags(0)
+    mPrefFlags(0),
+	mParent(nsnull)
 {
 //  NS_INIT_REFCNT(); done by superclass
 
@@ -102,7 +103,26 @@ nsMsgFolder::~nsMsgFolder(void)
 
 }
 
-NS_IMPL_ISUPPORTS_INHERITED(nsMsgFolder, nsRDFResource, nsIMsgFolder)
+NS_IMPL_ADDREF_INHERITED(nsMsgFolder, nsRDFResource)
+NS_IMPL_RELEASE_INHERITED(nsMsgFolder, nsRDFResource)
+
+NS_IMETHODIMP nsMsgFolder::QueryInterface(REFNSIID aIID, void** aInstancePtr)
+{
+	if (!aInstancePtr) return NS_ERROR_NULL_POINTER;
+	*aInstancePtr = nsnull;
+	if (aIID.Equals(nsIMsgFolder::GetIID()) || aIID.Equals(nsIFolder::GetIID()))
+	{
+		*aInstancePtr = NS_STATIC_CAST(nsIMsgFolder*, this);
+	}              
+
+	if(*aInstancePtr)
+	{
+		AddRef();
+		return NS_OK;
+	}
+
+	return nsRDFResource::QueryInterface(aIID, aInstancePtr);
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -178,6 +198,23 @@ NS_IMETHODIMP nsMsgFolder::RemoveFolderListener(nsIFolderListener * listener)
 
 }
 
+NS_IMETHODIMP nsMsgFolder::SetParent(nsIFolder *parent)
+{
+	//Don't addref due to ownership issues.
+	mParent = parent;
+	return NS_OK;
+}
+
+
+NS_IMETHODIMP nsMsgFolder::GetParent(nsIFolder **parent)
+{
+	if(!parent)
+		return NS_ERROR_NULL_POINTER;
+
+	*parent = mParent;
+	NS_IF_ADDREF(*parent);
+	return NS_OK;
+}
 
 NS_IMETHODIMP
 nsMsgFolder::GetMessages(nsIEnumerator* *result)
@@ -303,10 +340,6 @@ NS_IMETHODIMP nsMsgFolder::GetChildNamed(const char* name, nsISupports* *result)
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-NS_IMETHODIMP nsMsgFolder::GetParent(nsIFolder* *parent)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
 
 NS_IMETHODIMP nsMsgFolder::GetPrettiestName(char **name)
 {
@@ -513,55 +546,11 @@ NS_IMETHODIMP nsMsgFolder::ContainsChildNamed(const char *name, PRBool* contains
 		return NS_ERROR_NULL_POINTER;
 }
 
-NS_IMETHODIMP nsMsgFolder::FindParentOf(nsIMsgFolder * aFolder, nsIMsgFolder ** aParent)
+
+
+NS_IMETHODIMP nsMsgFolder::IsAncestorOf(nsIMsgFolder *child, PRBool *isAncestor)
 {
-	if(!aParent)
-		return NS_ERROR_NULL_POINTER;
-
-	nsresult rv;
-
-	*aParent = nsnull;
-
-	PRUint32 count = mSubFolders->Count();
-	nsCOMPtr<nsISupports> supports;
-	nsCOMPtr<nsIMsgFolder> child;
-
-	for (PRUint32 i = 0; i < count && *aParent == NULL; i++)
-	{
-		supports = getter_AddRefs(mSubFolders->ElementAt(i));
-		child = do_QueryInterface(supports, &rv);
-		if(NS_SUCCEEDED(rv) && child)
-		{
-			if (aFolder == child.get())
-			{
-				*aParent = this;
-				NS_ADDREF(*aParent);
-				return NS_OK;
-			}
-		}
-	}
-
-	for (PRUint32 j = 0; j < count && *aParent == NULL; j++)
-	{
-
-		supports = getter_AddRefs(mSubFolders->ElementAt(j));
-		child = do_QueryInterface(supports, &rv);
-		if(NS_SUCCEEDED(rv) && child)
-		{
-			rv = child->FindParentOf(aFolder, aParent);
-			if(NS_SUCCEEDED(rv))
-				return rv;
-		}
-
-	}
-
-	return rv;
-
-}
-
-NS_IMETHODIMP nsMsgFolder::IsParentOf(nsIMsgFolder *child, PRBool deep, PRBool *isParent)
-{
-	if(!isParent)
+	if(!isAncestor)
 		return NS_ERROR_NULL_POINTER;
 	
 	nsresult rv = NS_OK;
@@ -575,16 +564,17 @@ NS_IMETHODIMP nsMsgFolder::IsParentOf(nsIMsgFolder *child, PRBool deep, PRBool *
 		if(NS_SUCCEEDED(rv))
 		{
 			if (folder.get() == child )
-				*isParent = PR_TRUE;
-			else if(deep)
 			{
-				folder->IsParentOf(child, deep, isParent);
+				*isAncestor = PR_TRUE;
 			}
+			else
+				folder->IsAncestorOf(child, isAncestor);
+
 		}
-		if(*isParent)
+		if(*isAncestor)
 			return NS_OK;
     }
-	*isParent = PR_FALSE;
+	*isAncestor = PR_FALSE;
 	return rv;
 
 }
@@ -1013,10 +1003,10 @@ NS_IMETHODIMP nsMsgFolder::DisplayRecipients(PRBool *displayRecipients)
 #endif
 			for (int i = 0; i < numFccFolders; i++)
 			{
-				PRBool isParent;
-				if(NS_SUCCEEDED(rv = fccFolders[i]->IsParentOf(this, PR_TRUE, &isParent)))
+				PRBool isAncestor;
+				if(NS_SUCCEEDED(rv = fccFolders[i]->IsAncestorOf(this, &isAncestor)))
 				{
-					if (isParent)
+					if (isAncestor)
 						*displayRecipients = PR_TRUE;
 				}
 				NS_RELEASE(fccFolders[i]);
@@ -1281,7 +1271,6 @@ nsresult nsMsgFolder::NotifyItemDeleted(nsISupports *item)
 
 
 nsresult
-
 nsGetMailFolderSeparator(nsString& result)
 {
   static char* gMailFolderSep = nsnull;         // never freed

mailnews/base/util/nsMsgFolder.h

@@ -56,10 +56,11 @@ public:
   NS_IMETHOD GetName(char **name);
   NS_IMETHOD SetName(char *name);
   NS_IMETHOD GetChildNamed(const char *name, nsISupports* *result);
-  NS_IMETHOD GetParent(nsIFolder* *parent);
   NS_IMETHOD GetSubFolders(nsIEnumerator* *result);
 	NS_IMETHOD AddFolderListener(nsIFolderListener * listener);
 	NS_IMETHOD RemoveFolderListener(nsIFolderListener * listener);
+	NS_IMETHOD GetParent(nsIFolder * *aParent);
+	NS_IMETHOD SetParent(nsIFolder * aParent);
 
 
   // nsIMsgFolder methods:
@@ -116,8 +117,7 @@ public:
   NS_IMETHOD Adopt(nsIMsgFolder *srcFolder, PRUint32*);
 
   NS_IMETHOD ContainsChildNamed(const char *name, PRBool *containsChild);
-  NS_IMETHOD FindParentOf(nsIMsgFolder * aFolder, nsIMsgFolder ** aParent);
-  NS_IMETHOD IsParentOf(nsIMsgFolder *, PRBool deep, PRBool *isParent);
+  NS_IMETHOD IsAncestorOf(nsIMsgFolder * folder, PRBool *isParent);
 
   NS_IMETHOD GenerateUniqueSubfolderName(const char *prefix, nsIMsgFolder *otherFolder,
                                          char **name);
@@ -248,9 +248,11 @@ protected:
 	nsresult NotifyItemAdded(nsISupports *item);
 	nsresult NotifyItemDeleted(nsISupports *item);
 
+
 protected:
   nsString mName;
   PRUint32 mFlags;
+  nsIFolder *mParent;     //This won't be refcounted for ownership reasons.
   PRInt32 mNumUnreadMessages;        /* count of unread messages (-1 means
                                          unknown; -2 means unknown but we already
                                          tried to find out.) */
@@ -263,7 +265,7 @@ protected:
   PRUint8 mDepth;
   PRInt32 mPrefFlags;       // prefs like MSG_PREF_OFFLINE, MSG_PREF_ONE_PANE, etc
   nsISupports *mSemaphoreHolder; // set when the folder is being written to
-																 //Due to ownership issues, this won't be AddRef'd.
+								//Due to ownership issues, this won't be AddRef'd.
 
 #ifdef HAVE_DB
   nsMsgKey	m_lastMessageLoaded;