changed mime map service to use nsHashtabel

netwerk/mime/public/nsIMIMEService.idl

@@ -39,10 +39,10 @@
 [scriptable, uuid(6C424C90-2FE7-11d3-A164-0050041CAF44)]
 interface nsIMIMEService : nsISupports {
 	// return a nsIMIMEInfo for the given file extension.
-	nsIMIMEInfo GetFromExtension(in wstring aFileExt);
+	nsIMIMEInfo GetFromExtension(in string aFileExt);
 
 	// return a nsIMIMEInfo for the given MIME type.
-	nsIMIMEInfo GetFromMIMEType(in wstring aMIMEType);
+	nsIMIMEInfo GetFromMIMEType(in string aMIMEType);
 
 	// insert a nsIMIMEInfo in the the database.
 	void AddMIMEInfo(in nsIMIMEInfo aMIMEInfo);

netwerk/mime/src/nsMIMEInfoImpl.cpp

@@ -31,7 +31,6 @@ nsMIMEInfoImpl::nsMIMEInfoImpl(const char *aMIMEType, const char *aFileExtension
 }
 
 nsMIMEInfoImpl::~nsMIMEInfoImpl() {
-    delete mMIMEType;
 }
 
 PRBool

netwerk/mime/src/nsMIMEService.cpp

@@ -24,6 +24,17 @@
 #include "nsIMIMEInfo.h"
 #include "nsIFileSpec.h"
 
+PRBool DeleteEntry(nsHashKey *aKey, void *aData, void* closure) {
+    nsMIMEInfoImpl *entry = (nsMIMEInfoImpl*)aData;
+    delete entry;
+    entry = nsnull;
+    return PR_TRUE;   
+};
+
+PRBool FindMIMEType(nsHashKey *aKey, void *aData, void* closure) {
+    return PR_FALSE;
+}
+
 
 // nsISupports methods
 NS_IMPL_ISUPPORTS(nsMIMEService, nsCOMTypeInfo<nsIMIMEService>::GetIID());
@@ -34,17 +45,15 @@ nsMIMEService::nsMIMEService() {
 
     NS_INIT_REFCNT();
 
-    mInfoArray = new nsVoidArray();
+    mInfoHashtable = new nsHashtable();
     InitFromHack(); // XXX bogus
+    //nsresult rv = InitializeMIMEMap(mInfoHashtable);
 }
 
 nsMIMEService::~nsMIMEService() {
-    PRInt32 count = mInfoArray->Count();
+    mInfoHashtable->Enumerate(DeleteEntry, nsnull);
-    for (int i = 0; i < count; i++) {
+    mInfoHashtable->Reset();
-        nsMIMEInfoImpl *entry = (nsMIMEInfoImpl*)mInfoArray->ElementAt(i);
+    delete mInfoHashtable;
-        mInfoArray->RemoveElementAt(i);
-        //    delete entry;
-    }
 }
 
  /* This bad boy needs to retrieve a url, and parse the data coming back, and
@@ -76,56 +85,108 @@ nsMIMEService::InitFromFile(const char *aFileName) {
 
 nsresult
 nsMIMEService::InitFromHack() {
-
     nsMIMEInfoImpl* anInfo = nsnull;
-    anInfo = new nsMIMEInfoImpl("text/html", "htm,html", "Hyper Text Markup Language");
+    nsCStringKey *extKey = nsnull;
+
+    anInfo = new nsMIMEInfoImpl("text/html", "htm", "Hyper Text Markup Language");
     if (!anInfo) return NS_ERROR_OUT_OF_MEMORY;
-    mInfoArray->AppendElement(anInfo);
+    extKey = new nsCStringKey("htm");
+    if (!extKey) return NS_ERROR_OUT_OF_MEMORY;
+    mInfoHashtable->Put(extKey, anInfo);
+    delete extKey;
+
+    anInfo = new nsMIMEInfoImpl("text/html", "html", "Hyper Text Markup Language");
+    if (!anInfo) return NS_ERROR_OUT_OF_MEMORY;
+    extKey = new nsCStringKey("html");
+    if (!extKey) return NS_ERROR_OUT_OF_MEMORY;
+    mInfoHashtable->Put(extKey, anInfo);
+    delete extKey;
 
     anInfo = new nsMIMEInfoImpl("text/rdf", "rdf", "Resource Description Framework");
     if (!anInfo) return NS_ERROR_OUT_OF_MEMORY;
-    mInfoArray->AppendElement(anInfo);
+    extKey = new nsCStringKey("rdf");
+    if (!extKey) return NS_ERROR_OUT_OF_MEMORY;
+    mInfoHashtable->Put(extKey, anInfo);
+    delete extKey;
 
     anInfo = new nsMIMEInfoImpl("text/xul", "xul", "XML-Based User Interface Language");
     if (!anInfo) return NS_ERROR_OUT_OF_MEMORY;
-    mInfoArray->AppendElement(anInfo);
+    extKey = new nsCStringKey("xul");
+    if (!extKey) return NS_ERROR_OUT_OF_MEMORY;
+    mInfoHashtable->Put(extKey, anInfo);
+    delete extKey;
 
     anInfo = new nsMIMEInfoImpl("text/xml", "xml", "Extensible Markup Language");
     if (!anInfo) return NS_ERROR_OUT_OF_MEMORY;
-    mInfoArray->AppendElement(anInfo);
+    extKey = new nsCStringKey("xml");
+    if (!extKey) return NS_ERROR_OUT_OF_MEMORY;
+    mInfoHashtable->Put(extKey, anInfo);
+    delete extKey;
 
     anInfo = new nsMIMEInfoImpl("text/css", "css", "Style Sheet");
     if (!anInfo) return NS_ERROR_OUT_OF_MEMORY;
-    mInfoArray->AppendElement(anInfo);
+    extKey = new nsCStringKey("css");
+    if (!extKey) return NS_ERROR_OUT_OF_MEMORY;
+    mInfoHashtable->Put(extKey, anInfo);
+    delete extKey;
 
     anInfo = new nsMIMEInfoImpl("application/x-javascript", "js", "Javascript Source File");
     if (!anInfo) return NS_ERROR_OUT_OF_MEMORY;
-    mInfoArray->AppendElement(anInfo);
+    extKey = new nsCStringKey("js");
+    if (!extKey) return NS_ERROR_OUT_OF_MEMORY;
+    mInfoHashtable->Put(extKey, anInfo);
+    delete extKey;
 
-	 anInfo = new nsMIMEInfoImpl("message/rfc822", "eml", "RFC-822 data");
+    anInfo = new nsMIMEInfoImpl("message/rfc822", "eml", "RFC-822 data");
     if (!anInfo) return NS_ERROR_OUT_OF_MEMORY;
-    mInfoArray->AppendElement(anInfo);
+    extKey = new nsCStringKey("eml");
-
+    if (!extKey) return NS_ERROR_OUT_OF_MEMORY;
-    /////////////////
+    mInfoHashtable->Put(extKey, anInfo);
-    // Images
+    delete extKey;
-    /////////////////
 
     anInfo = new nsMIMEInfoImpl("image/gif", "gif", "GIF Image");
     if (!anInfo) return NS_ERROR_OUT_OF_MEMORY;
-    mInfoArray->AppendElement(anInfo);
+    extKey = new nsCStringKey("gif");
+    if (!extKey) return NS_ERROR_OUT_OF_MEMORY;
+    mInfoHashtable->Put(extKey, anInfo);
+    delete extKey;
 
-    anInfo = new nsMIMEInfoImpl("image/jpeg", "jpeg,jpg,jpe,jfif,pjpeg,pjp", "JPEG Image");
+    anInfo = new nsMIMEInfoImpl("image/jpeg", "jpeg", "JPEG Image");
     if (!anInfo) return NS_ERROR_OUT_OF_MEMORY;
-    mInfoArray->AppendElement(anInfo);
+    extKey = new nsCStringKey("jpeg");
+    if (!extKey) return NS_ERROR_OUT_OF_MEMORY;
+    mInfoHashtable->Put(extKey, anInfo);
+    delete extKey;
+
+    anInfo = new nsMIMEInfoImpl("image/jpeg", "jpg", "JPEG Image");
+    if (!anInfo) return NS_ERROR_OUT_OF_MEMORY;
+    extKey = new nsCStringKey("jpg");
+    if (!extKey) return NS_ERROR_OUT_OF_MEMORY;
+    mInfoHashtable->Put(extKey, anInfo);
+    delete extKey;
 
     anInfo = new nsMIMEInfoImpl("image/png", "png", "PNG Image");
     if (!anInfo) return NS_ERROR_OUT_OF_MEMORY;
-    mInfoArray->AppendElement(anInfo);
+    extKey = new nsCStringKey("png");
+    if (!extKey) return NS_ERROR_OUT_OF_MEMORY;
+    mInfoHashtable->Put(extKey, anInfo);
+    delete extKey;
 
-    anInfo = new nsMIMEInfoImpl("image/tiff", "tiff,tif", "TIFF Image");
+    anInfo = new nsMIMEInfoImpl("image/tiff", "tiff", "TIFF Image");
     if (!anInfo) return NS_ERROR_OUT_OF_MEMORY;
-    mInfoArray->AppendElement(anInfo);
+    extKey = new nsCStringKey("tiff");
-    
+    if (!extKey) return NS_ERROR_OUT_OF_MEMORY;
+    mInfoHashtable->Put(extKey, anInfo);
+    delete extKey;
+
+    anInfo = new nsMIMEInfoImpl("image/tiff", "tif", "TIFF Image");
+    if (!anInfo) return NS_ERROR_OUT_OF_MEMORY;
+    extKey = new nsCStringKey("tif");
+    if (!extKey) return NS_ERROR_OUT_OF_MEMORY;
+    mInfoHashtable->Put(extKey, anInfo);
+    delete extKey;
+
+#if 0
     anInfo = new nsMIMEInfoImpl("image/x-cmu-raster", "ras", "CMU Raster Image");
     if (!anInfo) return NS_ERROR_OUT_OF_MEMORY;
     mInfoArray->AppendElement(anInfo);
@@ -177,6 +238,7 @@ nsMIMEService::InitFromHack() {
      anInfo = new nsMIMEInfoImpl("application/fractals", "fif", "Fractal Image Format");
     if (!anInfo) return NS_ERROR_OUT_OF_MEMORY;
     mInfoArray->AppendElement(anInfo);
+#endif // 0
     
     return NS_OK;
 }
@@ -184,23 +246,22 @@ nsMIMEService::InitFromHack() {
 
 // nsIMIMEService methods
 NS_IMETHODIMP
-nsMIMEService::GetFromExtension(const PRUnichar *aFileExt, nsIMIMEInfo **_retval) {
+nsMIMEService::GetFromExtension(const char *aFileExt, nsIMIMEInfo **_retval) {
-    nsIAtom* extension = NS_NewAtom(aFileExt);
+    nsCStringKey key(aFileExt);
-    if (!extension) return NS_ERROR_OUT_OF_MEMORY;
 
-    PRInt32 count = mInfoArray->Count();
+    nsMIMEInfoImpl *entry = (nsMIMEInfoImpl*)mInfoHashtable->Get(&key);
-    for (int i = 0; i < count; i++) {
+    if (!entry) return NS_ERROR_FAILURE;
-        nsMIMEInfoImpl *entry = (nsMIMEInfoImpl*)mInfoArray->ElementAt(i);
+
-        if (entry->InExtensions(extension)) {
+    *_retval = NS_STATIC_CAST(nsIMIMEInfo*, entry);
-            *_retval = NS_STATIC_CAST(nsIMIMEInfo*, entry);
+    return NS_OK;
-            return NS_OK;
-        }
-    }
-    return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
-nsMIMEService::GetFromMIMEType(const PRUnichar *aMIMEType, nsIMIMEInfo **_retval) {
+nsMIMEService::GetFromMIMEType(const char *aMIMEType, nsIMIMEInfo **_retval) {
+
+#if 0
+    // hashtable, here's it's a little trickier because we have to enumerate the hashtable
+
     nsIAtom* MIMEType = NS_NewAtom(aMIMEType);
     if (!MIMEType) return NS_ERROR_OUT_OF_MEMORY;
 
@@ -212,7 +273,8 @@ nsMIMEService::GetFromMIMEType(const PRUnichar *aMIMEType, nsIMIMEInfo **_retval
             return NS_OK;
         }
     }
-    return NS_ERROR_FAILURE;
+#endif
+    return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP

netwerk/mime/src/nsMIMEService.h

@@ -26,7 +26,8 @@
 
 #include "nsIMIMEService.h"
 #include "nsIURI.h"
-class nsVoidArray;
+#include "nsHashtable.h"
+
 
 class nsMIMEService : public nsIMIMEService {
 
@@ -38,8 +39,9 @@ class nsMIMEService : public nsIMIMEService {
     virtual ~nsMIMEService();
 
     // nsIMIMEService methods
-    NS_IMETHOD GetFromExtension(const PRUnichar *aFileExt, nsIMIMEInfo **_retval);
+    NS_IMETHOD GetFromExtension(const char *aFileExt, nsIMIMEInfo **_retval);
-    NS_IMETHOD GetFromMIMEType(const PRUnichar *aMIMEType, nsIMIMEInfo **_retval);
+    NS_IMETHOD GetFromMIMEType(const char *aMIMEType, nsIMIMEInfo **_retval);
+
     NS_IMETHOD AddMIMEInfo(nsIMIMEInfo *aMIMEInfo);
     NS_IMETHOD RemoveMIMEInfo(nsIMIMEInfo *aMIMEInfo);
 
@@ -48,7 +50,8 @@ private:
     nsresult InitFromFile(const char *aFileName);
     nsresult InitFromHack();
 
-    nsVoidArray*            mInfoArray;
+    
+    nsHashtable             *mInfoHashtable;
 };
 
 #endif // ___nsIMIMEService__h___

uriloader/exthandler/nsMIMEInfoImpl.cpp

@@ -31,7 +31,6 @@ nsMIMEInfoImpl::nsMIMEInfoImpl(const char *aMIMEType, const char *aFileExtension
 }
 
 nsMIMEInfoImpl::~nsMIMEInfoImpl() {
-    delete mMIMEType;
 }
 
 PRBool