continuing work in progress on nsCOMArray<T> - take darin's suggestion and move all nsISupports-related code into a non-template base class nsCOMArray_base. This allows the generated template to be paper thin (or really, non-existent!)

Then, we move some of the non-trivial methods of this class into a .cpp file git-svn-id: svn://10.0.0.236/trunk@130604 18797224-902f-48f8-a5cc-f745e15eee43
2002-09-27 19:29:45 +00:00
parent 7625a51cd2
commit 49dbdd1151
2 changed files with 175 additions and 54 deletions
--- a/mozilla/xpcom/ds/nsCOMArray.cpp
+++ b/mozilla/xpcom/ds/nsCOMArray.cpp
@@ -0,0 +1,95 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsCOMArray.h"
+
+// implementations of non-trivial methods in nsCOMArray_base
+
+PRBool
+nsCOMArray_base::InsertObjectAt(nsISupports* aObject, PRInt32 aIndex) {
+    PRBool result = mArray.InsertElementAt(aObject, aIndex);
+    if (result)
+        NS_ADDREF(aObject);
+    return result;
+}
+
+PRBool
+nsCOMArray_base::ReplaceObjectAt(nsISupports* aObject, PRInt32 aIndex) {
+    nsISupports *oldObject = ObjectAt(aIndex);
+    NS_IF_RELEASE(oldObject);
+    PRBool result = mArray.ReplaceElementAt(aObject, aIndex);
+    if (result)
+        NS_ADDREF(aObject);
+    return result;
+}
+
+
+PRBool
+nsCOMArray_base::AppendObject(nsISupports *aObject) {
+    PRBool result = InsertObjectAt(aObject, Count());
+    if (result)
+        NS_ADDREF(aObject);
+    return result;
+}
+
+PRBool
+nsCOMArray_base::RemoveObject(nsISupports *aObject) {
+    PRBool result = mArray.RemoveElement(aObject);
+    if (result)
+        NS_RELEASE(aObject);
+    return result;
+}
+
+PRBool
+nsCOMArray_base::RemoveObjectAt(PRInt32 aIndex) {
+    nsISupports* element = ObjectAt(aIndex);
+    if (element) {
+        PRBool result = mArray.RemoveElementAt(aIndex);
+        if (result)
+            NS_RELEASE(element);
+        return result;
+    }
+    return PR_FALSE;
+}
+
+PRBool
+nsCOMArray_base::ClearObjectsCallback(void* aElement, void*)
+{
+    nsISupports* element = NS_STATIC_CAST(nsISupports*, aElement);
+    NS_RELEASE(element);
+    return PR_TRUE;
+}