зеркало из https://github.com/mozilla/pjs.git
GetWidget and SetWidget weren't doing proper AddRef and Release. Fixed the
code.
This commit is contained in:
hyatt%netscape.com
Родитель
fa5de0e788
Коммит
1f6fd926a9
|
|
@ -1,212 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.0 (the "NPL"); you may not use this file except in
|
||||
* compliance with the NPL. You may obtain a copy of the NPL at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
* for the specific language governing rights and limitations under the
|
||||
* NPL.
|
||||
*
|
||||
* The Initial Developer of this code under the NPL is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
/*
|
||||
|
||||
This is mostly a naive re-implementation of ht.c. There is currently
|
||||
lots of stuff missing. For example, sorting, drag-and-drop support,
|
||||
the "local HT database" (whatever that was for), fast access into
|
||||
the tree for GetNthItem(). The list goes on and on, and I'm sure
|
||||
that I don't know the half of it.
|
||||
|
||||
*/
|
||||
|
||||
#include "nsRDFDataModel.h"
|
||||
#include "nsRDFDataModelItem.h"
|
||||
#include "nsIRDFDataBase.h"
|
||||
#include "nsString.h"
|
||||
#include "plstr.h"
|
||||
#include "prprf.h"
|
||||
#include "rdf-int.h"
|
||||
|
||||
static NS_DEFINE_IID(kIDataModelIID, NS_IDATAMODEL_IID);
|
||||
static NS_DEFINE_IID(kIRDFResourceIID, NS_IRDFRESOURCE_IID);
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// Utility functions
|
||||
|
||||
static RDF
|
||||
rdf_GetDefaultDB(void)
|
||||
{
|
||||
// hackery that I don't understand from HTRDF_GetDB()
|
||||
static const char* gNavCenterDataSources1[15] = {
|
||||
"rdf:localStore",
|
||||
"rdf:remoteStore",
|
||||
"rdf:bookmarks",
|
||||
"rdf:remoteStore",
|
||||
"rdf:history",
|
||||
/* "rdf:ldap", */
|
||||
"rdf:esftp",
|
||||
/* "rdf:mail", */
|
||||
#ifdef XP_MAC
|
||||
"rdf:appletalk",
|
||||
#endif
|
||||
"rdf:lfs",
|
||||
"rdf:ht",
|
||||
"rdf:columns",
|
||||
"rdf:find",
|
||||
NULL
|
||||
};
|
||||
|
||||
return RDF_GetDB(gNavCenterDataSources1);
|
||||
}
|
||||
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
nsRDFDataModel::nsRDFDataModel(void)
|
||||
: mDB(NULL),
|
||||
mRoot(NULL),
|
||||
mWidget(NULL),
|
||||
mArcProperty(NULL)
|
||||
{
|
||||
PR_ASSERT(gCoreVocab);
|
||||
if (gCoreVocab) {
|
||||
mArcProperty = gCoreVocab->RDF_parent;
|
||||
mArcType = eRDFArcType_Inbound;
|
||||
}
|
||||
|
||||
NS_INIT_REFCNT();
|
||||
}
|
||||
|
||||
nsRDFDataModel::~nsRDFDataModel(void)
|
||||
{
|
||||
if (mRoot)
|
||||
mRoot->Release();
|
||||
|
||||
if (mDB)
|
||||
RDF_ReleaseDB(mDB);
|
||||
}
|
||||
|
||||
NS_IMPL_ADDREF(nsRDFDataModel);
|
||||
NS_IMPL_RELEASE(nsRDFDataModel);
|
||||
|
||||
NS_IMPL_QUERY_INTERFACE(nsRDFDataModel, kIDataModelIID);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// nsIDataModel interface
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsRDFDataModel::InitFromURL(const nsString& aUrl)
|
||||
{
|
||||
// XXX A ghastly simplification of HT_PaneFromURL()
|
||||
char* url = aUrl.ToNewCString();
|
||||
|
||||
const char* dbstr[2];
|
||||
dbstr[0] = getBaseURL(url);
|
||||
dbstr[1] = NULL;
|
||||
|
||||
mDB = RDF_GetDB(dbstr);
|
||||
PL_strfree(const_cast<char*>(dbstr[0]));
|
||||
|
||||
// XXX now we try to find the top-level resource in the
|
||||
// database. PR_FALSE indicates that, if it ain't there, don't
|
||||
// create it.
|
||||
RDF_Resource r = RDF_GetResource(mDB, url, PR_FALSE);
|
||||
delete url;
|
||||
|
||||
PR_ASSERT(r);
|
||||
if (! r)
|
||||
return NS_ERROR_UNEXPECTED;
|
||||
|
||||
nsRDFDataModelItem* item;
|
||||
nsresult res = CreateItem(r, item);
|
||||
if (NS_FAILED(res))
|
||||
return res;
|
||||
|
||||
if (mRoot)
|
||||
mRoot->Release();
|
||||
|
||||
mRoot = item; // n.b. implicit AddRef() in CreateItem()
|
||||
mRoot->SetOpenState(PR_TRUE);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsRDFDataModel::InitFromResource(nsIDMItem* pItem)
|
||||
{
|
||||
nsIRDFResource* resource;
|
||||
if (NS_FAILED(pItem->QueryInterface(kIRDFResourceIID, (void**) &resource)))
|
||||
return NS_ERROR_INVALID_ARG;
|
||||
|
||||
nsresult res = NS_OK;
|
||||
|
||||
do {
|
||||
RDF_Resource r;
|
||||
|
||||
if (NS_FAILED(res = resource->GetResource(r)))
|
||||
break;
|
||||
|
||||
nsRDFDataModelItem* item;
|
||||
if (NS_FAILED(res = CreateItem(r, item)))
|
||||
break;
|
||||
|
||||
if (mRoot)
|
||||
mRoot->Release();
|
||||
|
||||
mRoot = item; // n.b. implicit AddRef() in CreateItem()
|
||||
mRoot->SetOpenState(PR_TRUE);
|
||||
|
||||
if (mDB)
|
||||
RDF_ReleaseDB(mDB);
|
||||
|
||||
mDB = rdf_GetDefaultDB();
|
||||
} while (0);
|
||||
|
||||
resource->Release();
|
||||
return NS_ERROR_UNEXPECTED;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsRDFDataModel::GetDMWidget(nsIDMWidget*& widget) const
|
||||
{
|
||||
widget = GetWidget();
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsRDFDataModel::SetDMWidget(nsIDMWidget* widget)
|
||||
{
|
||||
SetWidget(widget);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsRDFDataModel::GetStringPropertyValue(nsString& value, const nsString& property) const
|
||||
{
|
||||
return NS_ERROR_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsRDFDataModel::GetIntPropertyValue(PRInt32& value, const nsString& property) const
|
||||
{
|
||||
return NS_ERROR_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// Implementation methods
|
||||
|
||||
|
|
@ -1,104 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.0 (the "NPL"); you may not use this file except in
|
||||
* compliance with the NPL. You may obtain a copy of the NPL at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
* for the specific language governing rights and limitations under the
|
||||
* NPL.
|
||||
*
|
||||
* The Initial Developer of this code under the NPL is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
#ifndef nsRDFDataModel_h__
|
||||
#define nsRDFDataModel_h__
|
||||
|
||||
#include "nsIDataModel.h"
|
||||
#include "rdf.h" // XXX
|
||||
|
||||
class nsString;
|
||||
class nsRDFDataModelItem;
|
||||
|
||||
enum nsRDFArcType {
|
||||
eRDFArcType_Outbound, // follow outbound arcs (e.g., children-of)
|
||||
eRDFArcType_Inbound // follow inbound arcs (e.g., parent-of)
|
||||
};
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
class nsRDFDataModel : public nsIDataModel {
|
||||
private:
|
||||
// XXX eventually, when we XPCOM the back-end
|
||||
//nsIRDFDataBase& mDB;
|
||||
|
||||
RDF mDB;
|
||||
nsRDFDataModelItem* mRoot;
|
||||
nsIDMWidget* mWidget;
|
||||
|
||||
RDF_Resource mArcProperty;
|
||||
nsRDFArcType mArcType;
|
||||
|
||||
public:
|
||||
nsRDFDataModel(void);
|
||||
virtual ~nsRDFDataModel(void);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// nsISupports
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// nsIDataModel interface
|
||||
|
||||
// Initializers
|
||||
NS_IMETHOD InitFromURL(const nsString& url);
|
||||
NS_IMETHOD InitFromResource(nsIDMItem* pResource);
|
||||
|
||||
// Inspectors
|
||||
NS_IMETHOD GetDMWidget(nsIDMWidget*& pWidget) const;
|
||||
|
||||
// Setters
|
||||
NS_IMETHOD SetDMWidget(nsIDMWidget* pWidget);
|
||||
|
||||
// Methods to query the data model for property values for an entire widget.
|
||||
NS_IMETHOD GetStringPropertyValue(nsString& value, const nsString& property) const;
|
||||
NS_IMETHOD GetIntPropertyValue(PRInt32& value, const nsString& property) const;
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// Implementation methods
|
||||
|
||||
RDF GetDB(void) const {
|
||||
return mDB;
|
||||
}
|
||||
|
||||
nsRDFDataModelItem* GetRoot(void) const {
|
||||
return mRoot;
|
||||
}
|
||||
|
||||
nsIDMWidget* GetWidget(void) const {
|
||||
return mWidget;
|
||||
}
|
||||
|
||||
void SetWidget(nsIDMWidget* widget) {
|
||||
mWidget = widget;
|
||||
}
|
||||
|
||||
RDF_Resource GetArcProperty(void) const {
|
||||
return mArcProperty;
|
||||
}
|
||||
|
||||
nsRDFArcType GetArcType(void) const {
|
||||
return mArcType;
|
||||
}
|
||||
|
||||
virtual NS_METHOD
|
||||
CreateItem(RDF_Resource r, nsRDFDataModelItem*& result) = 0;
|
||||
};
|
||||
|
||||
#endif // nsRDFDataModel_h__
|
||||
Загрузка…
Ссылка в новой задаче