Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

got rid of m_pNSIFactory, service manager is used to manage singletons. renamed g_pNSIServiceManager to theServiceMangager.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@27070 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
beard%netscape.com 1999-04-11 00:01:17 +00:00
parent f6e9d16831
commit 34eb24753a
2 changed files with 12 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
mozilla/modules/oji/src/nsCJVMManagerFactory.cpp
View File

@ -31,9 +31,7 @@ static NS_DEFINE_IID(kIServiceManagerIID, NS_ISERVICEMANAGER_IID);
static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
static NS_DEFINE_IID(kCJVMManagerCID, NS_JVMMANAGER_CID);
nsIFactory *nsCJVMManagerFactory::m_pNSIFactory = NULL;
nsIServiceManager *g_pNSIServiceManager = NULL;
nsIServiceManager *theServiceManager = NULL;
/*+++++++++++++++++++++++++++++++++++++++++++++++++
* NSGetFactory:
@ -47,21 +45,25 @@ NSGetFactory(nsISupports* serviceMgr,
const char *aProgID,
nsIFactory **aFactory)
{
nsresult res = NS_OK;
if (!aClass.Equals(kCJVMManagerCID)) {
return NS_ERROR_FACTORY_NOT_LOADED; // XXX right error?
}
// first off, cache a reference to the service manager for later use.
if (theServiceManager == NULL) {
if (serviceMgr->QueryInterface(kIServiceManagerIID, (void**)&theServiceManager) != NS_OK)
theServiceManager = NULL;
}
// now, create the JVM manager factory.
nsCJVMManagerFactory* factory = new nsCJVMManagerFactory();
if (factory == NULL)
return NS_ERROR_OUT_OF_MEMORY;
NS_ADDREF(factory);
*aFactory = factory;
res = serviceMgr->QueryInterface(kIServiceManagerIID, (void**)&g_pNSIServiceManager);
if ((NS_OK == res) && (nsnull != g_pNSIServiceManager))
{
return NS_OK;
}
return res;
return NS_OK;
}
extern "C" NS_EXPORT PRBool
@ -132,37 +134,8 @@ nsCJVMManagerFactory::LockFactory(PRBool aLock)
nsCJVMManagerFactory::nsCJVMManagerFactory(void)
{
NS_INIT_REFCNT();
// this code is totally bogus in the new service manager world.
#if 0
if( m_pNSIFactory != NULL)
{
return;
}
nsresult err = NS_OK;
NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
err = this->QueryInterface(kIFactoryIID, (void**)&m_pNSIFactory);
if ( (err == NS_OK) && (m_pNSIFactory != NULL) )
{
NS_DEFINE_CID(kCJVMManagerCID, NS_CCAPSMANAGER_CID);
nsComponentManager::RegisterFactory(kCJVMManagerCID, NULL, NULL,
m_pNSIFactory, PR_FALSE);
}
#endif
}
nsCJVMManagerFactory::~nsCJVMManagerFactory()
{
// this code is totally wrong. we're in a destructor, and whatever our reference count is our object is going
// away.
#if 0
if(mRefCnt == 0)
{
NS_DEFINE_CID(kCJVMManagerCID, NS_CCAPSMANAGER_CID);
nsComponentManager::UnregisterFactory(kCJVMManagerCID, (nsIFactory *)m_pNSIFactory);
}
#endif
}

3
mozilla/modules/oji/src/nsCJVMManagerFactory.h
View File

@ -44,9 +44,6 @@ public:
nsCJVMManagerFactory(void);
virtual ~nsCJVMManagerFactory(void);
protected:
static nsIFactory *m_pNSIFactory;
};
#endif // nsCJVMManagerFactory_h___