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

Changed over to the service model. Seems cleaner now.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@19872 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
erik%netscape.com 1999-02-05 21:10:04 +00:00
parent 6c9f7e2e5a
commit e8c30ece41
3 changed files with 83 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/intl/strres/public/nsIStringBundle.h
View File

@ -19,18 +19,17 @@
#ifndef nsIStringBundle_h___
#define nsIStringBundle_h___
#include "nsIFactory.h"
#include "nsILocale.h"
#include "nsIURL.h"
#include "nsString.h"
// {D85A17C0-AA7C-11d2-9B8C-00805F8A16D9}
#define NS_ISTRINGBUNDLEFACTORY_IID \
#define NS_ISTRINGBUNDLESERVICE_IID \
{ 0xd85a17c0, 0xaa7c, 0x11d2, \
{ 0x9b, 0x8c, 0x0, 0x80, 0x5f, 0x8a, 0x16, 0xd9 } }
// {D85A17C1-AA7C-11d2-9B8C-00805F8A16D9}
#define NS_STRINGBUNDLEFACTORY_CID \
#define NS_STRINGBUNDLESERVICE_CID \
{ 0xd85a17c1, 0xaa7c, 0x11d2, \
{ 0x9b, 0x8c, 0x0, 0x80, 0x5f, 0x8a, 0x16, 0xd9 } }
@ -39,11 +38,6 @@
{ 0xd85a17c2, 0xaa7c, 0x11d2, \
{ 0x9b, 0x8c, 0x0, 0x80, 0x5f, 0x8a, 0x16, 0xd9 } }
// {D85A17C3-AA7C-11d2-9B8C-00805F8A16D9}
#define NS_STRINGBUNDLE_CID \
{ 0xd85a17c3, 0xaa7c, 0x11d2, \
{ 0x9b, 0x8c, 0x0, 0x80, 0x5f, 0x8a, 0x16, 0xd9 } }
class nsIStringBundle : public nsISupports
{
public:
@ -51,7 +45,7 @@ public:
NS_IMETHOD GetStringFromName(const nsString& aName, nsString& aResult) = 0;
};
class nsIStringBundleFactory : public nsIFactory
class nsIStringBundleService : public nsISupports
{
public:
NS_IMETHOD CreateBundle(nsIURL* aURL, nsILocale* aLocale,

104
mozilla/intl/strres/src/nsStringBundle.cpp
View File

@ -34,14 +34,14 @@ static PRInt32 gLockCount = 0;
NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
NS_DEFINE_IID(kIStringBundleIID, NS_ISTRINGBUNDLE_IID);
NS_DEFINE_IID(kIStringBundleFactoryIID, NS_ISTRINGBUNDLEFACTORY_IID);
NS_DEFINE_IID(kStringBundleFactoryCID, NS_STRINGBUNDLEFACTORY_CID);
NS_DEFINE_IID(kIStringBundleServiceIID, NS_ISTRINGBUNDLESERVICE_IID);
NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
static NS_DEFINE_IID(kINetServiceIID, NS_INETSERVICE_IID);
static NS_DEFINE_IID(kIPropertiesIID, NS_IPROPERTIES_IID);
static NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID);
class nsStringBundle : public nsISupports
class nsStringBundle : public nsIStringBundle
{
public:
nsStringBundle(nsIURL* aURL, nsILocale* aLocale, nsresult* aResult);
@ -58,6 +58,8 @@ public:
nsStringBundle::nsStringBundle(nsIURL* aURL, nsILocale* aLocale,
nsresult* aResult)
{
NS_INIT_REFCNT();
mProps = nsnull;
nsINetService* pNetService = nsnull;
@ -107,44 +109,31 @@ nsStringBundle::GetStringFromName(const nsString& aName, nsString& aResult)
return ret;
}
class nsStringBundleFactory : public nsIStringBundleFactory
class nsStringBundleService : public nsIStringBundleService
{
public:
NS_DECL_ISUPPORTS
nsStringBundleFactory() { NS_INIT_ISUPPORTS(); }
nsStringBundleService();
virtual ~nsStringBundleService();
NS_IMETHOD CreateInstance(nsISupports* aOuter, REFNSIID aIID, void** aResult);
NS_IMETHOD LockFactory(PRBool aLock);
NS_DECL_ISUPPORTS
NS_IMETHOD CreateBundle(nsIURL* aURL, nsILocale* aLocale,
nsIStringBundle** aResult);
};
NS_IMPL_ISUPPORTS(nsStringBundleFactory, kIStringBundleFactoryIID)
NS_IMETHODIMP
nsStringBundleFactory::CreateInstance(nsISupports* aOuter, REFNSIID aIID,
void** aResult)
nsStringBundleService::nsStringBundleService()
{
return NS_OK;
NS_INIT_REFCNT();
}
NS_IMETHODIMP
nsStringBundleFactory::LockFactory(PRBool aLock)
nsStringBundleService::~nsStringBundleService()
{
if (aLock) {
PR_AtomicIncrement(&gLockCount);
}
else {
PR_AtomicDecrement(&gLockCount);
}
return NS_OK;
}
NS_IMPL_ISUPPORTS(nsStringBundleService, kIStringBundleServiceIID)
NS_IMETHODIMP
nsStringBundleFactory::CreateBundle(nsIURL* aURL, nsILocale* aLocale,
nsStringBundleService::CreateBundle(nsIURL* aURL, nsILocale* aLocale,
nsIStringBundle** aResult)
{
nsresult ret = NS_OK;
@ -164,12 +153,65 @@ nsStringBundleFactory::CreateBundle(nsIURL* aURL, nsILocale* aLocale,
return ret;
}
class nsStringBundleServiceFactory : public nsIFactory
{
public:
nsStringBundleServiceFactory();
virtual ~nsStringBundleServiceFactory();
NS_DECL_ISUPPORTS
NS_IMETHOD CreateInstance(nsISupports* aOuter, REFNSIID aIID, void** aResult);
NS_IMETHOD LockFactory(PRBool aLock);
};
nsStringBundleServiceFactory::nsStringBundleServiceFactory()
{
NS_INIT_REFCNT();
}
nsStringBundleServiceFactory::~nsStringBundleServiceFactory()
{
}
NS_IMPL_ISUPPORTS(nsStringBundleServiceFactory, kIFactoryIID)
NS_IMETHODIMP
nsStringBundleServiceFactory::CreateInstance(nsISupports* aOuter,
REFNSIID aIID, void** aResult)
{
nsStringBundleService* service = new nsStringBundleService();
if (!service) {
return NS_ERROR_OUT_OF_MEMORY;
}
nsresult ret = service->QueryInterface(aIID, aResult);
if (NS_FAILED(ret)) {
delete service;
return ret;
}
return ret;
}
NS_IMETHODIMP
nsStringBundleServiceFactory::LockFactory(PRBool aLock)
{
if (aLock) {
PR_AtomicIncrement(&gLockCount);
}
else {
PR_AtomicDecrement(&gLockCount);
}
return NS_OK;
}
extern "C" NS_EXPORT nsresult
NSRegisterSelf(const char* path)
{
nsresult ret;
ret = nsRepository::RegisterFactory(kStringBundleFactoryCID, path,
ret = nsRepository::RegisterFactory(kStringBundleServiceCID, path,
PR_TRUE, PR_TRUE);
if (NS_FAILED(ret)) {
return ret;
@ -183,7 +225,7 @@ NSUnregisterSelf(const char* path)
{
nsresult ret;
ret = nsRepository::UnregisterFactory(kStringBundleFactoryCID, path);
ret = nsRepository::UnregisterFactory(kStringBundleServiceCID, path);
if (NS_FAILED(ret)) {
return ret;
}
@ -200,12 +242,12 @@ NSGetFactory(const nsCID& aClass, nsISupports* aServMgr, nsIFactory** aFactory)
return NS_ERROR_NULL_POINTER;
}
if (aClass.Equals(kStringBundleFactoryCID)) {
nsStringBundleFactory* factory = new nsStringBundleFactory();
if (aClass.Equals(kStringBundleServiceCID)) {
nsStringBundleServiceFactory* factory = new nsStringBundleServiceFactory();
if (!factory) {
return NS_ERROR_OUT_OF_MEMORY;
}
res = factory->QueryInterface(kIStringBundleFactoryIID, (void**) aFactory);
res = factory->QueryInterface(kIFactoryIID, (void**) aFactory);
if (NS_FAILED(res)) {
*aFactory = nsnull;
delete factory;

14
mozilla/intl/strres/tests/StringBundleTest.cpp
View File

@ -32,20 +32,20 @@
static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID);
static NS_DEFINE_IID(kINetServiceIID, NS_INETSERVICE_IID);
static NS_DEFINE_IID(kIStringBundleFactoryIID, NS_ISTRINGBUNDLEFACTORY_IID);
static NS_DEFINE_IID(kIStringBundleServiceIID, NS_ISTRINGBUNDLESERVICE_IID);
static NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID);
static NS_DEFINE_IID(kStringBundleFactoryCID, NS_STRINGBUNDLEFACTORY_CID);
static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
int
main(int argc, char *argv[])
{
nsresult ret;
nsIStringBundleFactory* factory = nsnull;
ret = nsRepository::FindFactory(kStringBundleFactoryCID,
(nsIFactory**) &factory);
nsIStringBundleService* service = nsnull;
ret = nsServiceManager::GetService(kStringBundleServiceCID,
kIStringBundleServiceIID, (nsISupports**) &service);
if (NS_FAILED(ret)) {
printf("cannot create factory\n");
printf("cannot create service\n");
return 1;
}
@ -83,7 +83,7 @@ main(int argc, char *argv[])
nsILocale* locale = nsnull;
nsIStringBundle* bundle = nsnull;
ret = factory->CreateBundle(url, locale, &bundle);
ret = service->CreateBundle(url, locale, &bundle);
if (NS_FAILED(ret)) {
printf("cannot create instance\n");
return 1;