From 2f249a5562bbb34d3b77c38d56f9297f875fbf0d Mon Sep 17 00:00:00 2001 From: "bryner%netscape.com" Date: Sun, 5 Jan 2003 05:38:27 +0000 Subject: [PATCH] Removing a long-dead file. Not part of the build. git-svn-id: svn://10.0.0.236/trunk@135854 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/htmlparser/src/nsParserFactory.cpp | 207 ------------------ .../parser/htmlparser/src/nsParserFactory.cpp | 207 ------------------ 2 files changed, 414 deletions(-) delete mode 100644 mozilla/htmlparser/src/nsParserFactory.cpp delete mode 100644 mozilla/parser/htmlparser/src/nsParserFactory.cpp diff --git a/mozilla/htmlparser/src/nsParserFactory.cpp b/mozilla/htmlparser/src/nsParserFactory.cpp deleted file mode 100644 index 456d6af999f..00000000000 --- a/mozilla/htmlparser/src/nsParserFactory.cpp +++ /dev/null @@ -1,207 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** 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 "nscore.h" -#include "nsIFactory.h" -#include "nsISupports.h" -#include "nsIHTMLContentSink.h" -#include "nsParserCIID.h" -#include "nsILoggingSink.h" -#include "nsParser.h" -#include "nsParserNode.h" -#include "CNavDTD.h" - -#include "nsHTMLTags.h" -#include "nsHTMLEntities.h" - -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); -static NS_DEFINE_IID(kCParserNode, NS_PARSER_NODE_IID); - -static NS_DEFINE_CID(kCParserCID NS_PARSER_CID); -static NS_DEFINE_CID(kLoggingSinkCID, NS_LOGGING_SINK_CID); -static NS_DEFINE_CID(kExpatDriverCID, NS_EXPAT_DRIVER_CID); -static NS_DEFINE_CID(kCNavDTDCID, NS_CNAVDTD_CID); - -class nsParserFactory : public nsIFactory -{ - public: - NS_DECL_ISUPPORTS - NS_DECL_NSIFACTORY - - nsParserFactory(const nsCID &aClass); - virtual ~nsParserFactory(); - - private: - nsCID mClassID; -}; - -nsParserFactory::nsParserFactory(const nsCID &aClass) -{ - NS_INIT_ISUPPORTS(); - mClassID = aClass; - nsHTMLTags::AddRefTable(); - nsHTMLEntities::AddRefTable(); -} - -nsParserFactory::~nsParserFactory() -{ - nsHTMLEntities::ReleaseTable(); - nsHTMLTags::ReleaseTable(); -} - -nsresult nsParserFactory::QueryInterface(const nsIID &aIID, - void **aResult) -{ - if (aResult == NULL) { - return NS_ERROR_NULL_POINTER; - } - - // Always NULL result, in case of failure - *aResult = NULL; - - if (aIID.Equals(kISupportsIID)) { - *aResult = (void *)(nsISupports*)this; - } else if (aIID.Equals(kIFactoryIID)) { - *aResult = (void *)(nsIFactory*)this; - } - - if (*aResult == NULL) { - return NS_NOINTERFACE; - } - - NS_ADDREF_THIS(); // Increase reference count for caller - return NS_OK; -} - -NS_IMPL_ADDREF(nsParserFactory); -NS_IMPL_RELEASE(nsParserFactory); - -nsresult nsParserFactory::CreateInstance(nsISupports *aOuter, - const nsIID &aIID, - void **aResult) -{ - if (aResult == NULL) { - return NS_ERROR_NULL_POINTER; - } - - *aResult = NULL; - - nsISupports *inst = nsnull; - - if (mClassID.Equals(kCParser)) { - nsParser* p; - NS_NEWXPCOM(p, nsParser); - inst = (nsISupports *)(nsIParser *)p; - } - else if (mClassID.Equals(kCParserNode)) { - nsCParserNode* cpn; - NS_NEWXPCOM(cpn, nsCParserNode); - inst = (nsISupports *)(nsIParserNode *) cpn; - } - else if (mClassID.Equals(kLoggingSinkCID)) { - nsIContentSink* cs; - nsresult rv = NS_NewHTMLLoggingSink(&cs); - if (NS_OK != rv) { - return rv; - } - *aResult = cs; - return rv; - } - else if (mClassID.Equals(kExpatDriverCID)) { - nsresult rv = NS_NewExpatDriver((nsIDTD**) &inst); - if (NS_FAILED(rv)) { - return rv; - } - } - else if (mClassID.Equals(kCNavDTDCID)) { - nsresult rv = NS_NewNavHTMLDTD((nsIDTD**) &inst); - if (NS_FAILED(rv)) { - return rv; - } - } - - if (inst == NULL) { - return NS_ERROR_OUT_OF_MEMORY; - } - - nsresult res = inst->QueryInterface(aIID, aResult); - - if (res != NS_OK) { - // We didn't get the right interface, so clean up - delete inst; - } - - return res; -} - -nsresult nsParserFactory::LockFactory(PRBool aLock) -{ - // Not implemented in simplest case. - return NS_OK; -} - -// return the proper factory to the caller -#if defined(XP_MAC) && defined(MAC_STATIC) -extern "C" NS_EXPORT nsresult -NSGetFactory_PARSER_DLL(nsISupports* serviceMgr, - const nsCID &aClass, - const char *aClassName, - const char *aContractID, - nsIFactory **aFactory) -#else -extern "C" NS_EXPORT nsresult -NSGetFactory(nsISupports* serviceMgr, - const nsCID &aClass, - const char *aClassName, - const char *aContractID, - nsIFactory **aFactory) -#endif -{ - if (nsnull == aFactory) { - return NS_ERROR_NULL_POINTER; - } - - *aFactory = new nsParserFactory(aClass); - - if (nsnull == aFactory) { - return NS_ERROR_OUT_OF_MEMORY; - } - - return (*aFactory)->QueryInterface(kIFactoryIID, (void**)aFactory); -} diff --git a/mozilla/parser/htmlparser/src/nsParserFactory.cpp b/mozilla/parser/htmlparser/src/nsParserFactory.cpp deleted file mode 100644 index 456d6af999f..00000000000 --- a/mozilla/parser/htmlparser/src/nsParserFactory.cpp +++ /dev/null @@ -1,207 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** 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 "nscore.h" -#include "nsIFactory.h" -#include "nsISupports.h" -#include "nsIHTMLContentSink.h" -#include "nsParserCIID.h" -#include "nsILoggingSink.h" -#include "nsParser.h" -#include "nsParserNode.h" -#include "CNavDTD.h" - -#include "nsHTMLTags.h" -#include "nsHTMLEntities.h" - -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); -static NS_DEFINE_IID(kCParserNode, NS_PARSER_NODE_IID); - -static NS_DEFINE_CID(kCParserCID NS_PARSER_CID); -static NS_DEFINE_CID(kLoggingSinkCID, NS_LOGGING_SINK_CID); -static NS_DEFINE_CID(kExpatDriverCID, NS_EXPAT_DRIVER_CID); -static NS_DEFINE_CID(kCNavDTDCID, NS_CNAVDTD_CID); - -class nsParserFactory : public nsIFactory -{ - public: - NS_DECL_ISUPPORTS - NS_DECL_NSIFACTORY - - nsParserFactory(const nsCID &aClass); - virtual ~nsParserFactory(); - - private: - nsCID mClassID; -}; - -nsParserFactory::nsParserFactory(const nsCID &aClass) -{ - NS_INIT_ISUPPORTS(); - mClassID = aClass; - nsHTMLTags::AddRefTable(); - nsHTMLEntities::AddRefTable(); -} - -nsParserFactory::~nsParserFactory() -{ - nsHTMLEntities::ReleaseTable(); - nsHTMLTags::ReleaseTable(); -} - -nsresult nsParserFactory::QueryInterface(const nsIID &aIID, - void **aResult) -{ - if (aResult == NULL) { - return NS_ERROR_NULL_POINTER; - } - - // Always NULL result, in case of failure - *aResult = NULL; - - if (aIID.Equals(kISupportsIID)) { - *aResult = (void *)(nsISupports*)this; - } else if (aIID.Equals(kIFactoryIID)) { - *aResult = (void *)(nsIFactory*)this; - } - - if (*aResult == NULL) { - return NS_NOINTERFACE; - } - - NS_ADDREF_THIS(); // Increase reference count for caller - return NS_OK; -} - -NS_IMPL_ADDREF(nsParserFactory); -NS_IMPL_RELEASE(nsParserFactory); - -nsresult nsParserFactory::CreateInstance(nsISupports *aOuter, - const nsIID &aIID, - void **aResult) -{ - if (aResult == NULL) { - return NS_ERROR_NULL_POINTER; - } - - *aResult = NULL; - - nsISupports *inst = nsnull; - - if (mClassID.Equals(kCParser)) { - nsParser* p; - NS_NEWXPCOM(p, nsParser); - inst = (nsISupports *)(nsIParser *)p; - } - else if (mClassID.Equals(kCParserNode)) { - nsCParserNode* cpn; - NS_NEWXPCOM(cpn, nsCParserNode); - inst = (nsISupports *)(nsIParserNode *) cpn; - } - else if (mClassID.Equals(kLoggingSinkCID)) { - nsIContentSink* cs; - nsresult rv = NS_NewHTMLLoggingSink(&cs); - if (NS_OK != rv) { - return rv; - } - *aResult = cs; - return rv; - } - else if (mClassID.Equals(kExpatDriverCID)) { - nsresult rv = NS_NewExpatDriver((nsIDTD**) &inst); - if (NS_FAILED(rv)) { - return rv; - } - } - else if (mClassID.Equals(kCNavDTDCID)) { - nsresult rv = NS_NewNavHTMLDTD((nsIDTD**) &inst); - if (NS_FAILED(rv)) { - return rv; - } - } - - if (inst == NULL) { - return NS_ERROR_OUT_OF_MEMORY; - } - - nsresult res = inst->QueryInterface(aIID, aResult); - - if (res != NS_OK) { - // We didn't get the right interface, so clean up - delete inst; - } - - return res; -} - -nsresult nsParserFactory::LockFactory(PRBool aLock) -{ - // Not implemented in simplest case. - return NS_OK; -} - -// return the proper factory to the caller -#if defined(XP_MAC) && defined(MAC_STATIC) -extern "C" NS_EXPORT nsresult -NSGetFactory_PARSER_DLL(nsISupports* serviceMgr, - const nsCID &aClass, - const char *aClassName, - const char *aContractID, - nsIFactory **aFactory) -#else -extern "C" NS_EXPORT nsresult -NSGetFactory(nsISupports* serviceMgr, - const nsCID &aClass, - const char *aClassName, - const char *aContractID, - nsIFactory **aFactory) -#endif -{ - if (nsnull == aFactory) { - return NS_ERROR_NULL_POINTER; - } - - *aFactory = new nsParserFactory(aClass); - - if (nsnull == aFactory) { - return NS_ERROR_OUT_OF_MEMORY; - } - - return (*aFactory)->QueryInterface(kIFactoryIID, (void**)aFactory); -}