Fix warnings and nsCOMPtr bustage.

git-svn-id: svn://10.0.0.236/branches/XUL_19990526_BRANCH@32685 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/content/xul/content/public/nsIXULPopupListener.h

@@ -0,0 +1,45 @@
+/* -*- 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.
+ */
+
+#ifndef nsIXULPopupListener_h__
+#define nsIXULPopupListener_h__
+
+// {2C453161-0942-11d3-BF87-00105A1B0627}
+#define NS_IXULPOPUPLISTENER_IID \
+{ 0x2c453161, 0x942, 0x11d3, { 0xbf, 0x87, 0x0, 0x10, 0x5a, 0x1b, 0x6, 0x27 } }
+
+class nsIDOMElement;
+
+typedef enum {
+    eXULPopupType_popup,
+    eXULPopupType_context,
+    eXULPopupType_tooltip,
+    eXULPopupType_blur
+} XULPopupType;
+
+class nsIXULPopupListener: public nsISupports {
+public:
+    static const nsIID& GetIID() { static nsIID iid = NS_IXULPOPUPLISTENER_IID; return iid; }
+
+    NS_IMETHOD Init(nsIDOMElement* anElement, const XULPopupType& aPopupType) = 0;
+};
+
+extern nsresult
+NS_NewXULPopupListener(nsIXULPopupListener** result);
+
+#endif // nsIXULPopupListener_h__

mozilla/content/xul/content/src/nsRDFDOMNodeList.cpp

@@ -0,0 +1,311 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/*
+
+    Helper class to implement the nsIDOMNodeList interface.
+
+    XXX It's probably wrong in some sense, as it uses the "naked"
+    content interface to look for kids. (I assume in general this is
+    bad because there may be pseudo-elements created for presentation
+    that aren't visible to the DOM.)
+
+*/
+
+#include "nsDOMCID.h"
+#include "nsIDOMNode.h"
+#include "nsIDOMHTMLCollection.h"
+#include "nsIDOMScriptObjectFactory.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIServiceManager.h"
+#include "nsISupportsArray.h"
+#include "nsRDFDOMNodeList.h"
+
+////////////////////////////////////////////////////////////////////////
+// GUID definitions
+
+static NS_DEFINE_IID(kIDOMNodeIID,                NS_IDOMNODE_IID);
+static NS_DEFINE_IID(kIDOMNodeListIID,            NS_IDOMNODELIST_IID);
+static NS_DEFINE_IID(kIDOMScriptObjectFactoryIID, NS_IDOM_SCRIPT_OBJECT_FACTORY_IID);
+
+static NS_DEFINE_CID(kDOMScriptObjectFactoryCID,  NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
+
+////////////////////////////////////////////////////////////////////////
+//
+
+class RDFHTMLCollectionImpl : public nsIDOMHTMLCollection
+{
+private:
+    nsRDFDOMNodeList* mOuter;
+
+public:
+    RDFHTMLCollectionImpl(nsRDFDOMNodeList* aOuter);
+    virtual ~RDFHTMLCollectionImpl();
+
+    // nsISupports interface
+    NS_IMETHOD_(nsrefcnt) AddRef(void);
+    NS_IMETHOD_(nsrefcnt) Release(void);
+    NS_IMETHOD QueryInterface(REFNSIID aIID, void** aResult);
+    
+    // nsIDOMHTMLCollection interface
+    NS_DECL_IDOMHTMLCOLLECTION
+};
+
+
+RDFHTMLCollectionImpl::RDFHTMLCollectionImpl(nsRDFDOMNodeList* aOuter)
+    : mOuter(aOuter)
+{
+}
+
+RDFHTMLCollectionImpl::~RDFHTMLCollectionImpl(void)
+{
+}
+
+NS_IMETHODIMP_(nsrefcnt)
+RDFHTMLCollectionImpl::AddRef(void)
+{
+    return mOuter->AddRef();
+}
+
+NS_IMETHODIMP_(nsrefcnt)
+RDFHTMLCollectionImpl::Release(void)
+{
+    return mOuter->Release();
+}
+
+NS_IMETHODIMP
+RDFHTMLCollectionImpl::QueryInterface(REFNSIID aIID, void** aResult)
+{
+    NS_PRECONDITION(aResult != nsnull, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    if (aIID.Equals(nsIDOMHTMLCollection::GetIID())) {
+        *aResult = NS_STATIC_CAST(nsIDOMHTMLCollection*, this);
+        NS_ADDREF(this);
+        return NS_OK;
+    }
+    else {
+        return mOuter->QueryInterface(aIID, aResult);
+    }
+}
+
+
+NS_IMETHODIMP
+RDFHTMLCollectionImpl::GetLength(PRUint32* aLength)
+{
+    return mOuter->GetLength(aLength);
+}
+
+
+NS_IMETHODIMP
+RDFHTMLCollectionImpl::Item(PRUint32 aIndex, nsIDOMNode** aReturn)
+{
+    return mOuter->Item(aIndex, aReturn);
+}
+
+
+NS_IMETHODIMP
+RDFHTMLCollectionImpl::NamedItem(const nsString& aName, nsIDOMNode** aReturn)
+{
+    NS_NOTYETIMPLEMENTED("write me!");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+
+////////////////////////////////////////////////////////////////////////
+// ctors & dtors
+
+nsRDFDOMNodeList::nsRDFDOMNodeList(void)
+    : mInner(nsnull),
+      mElements(nsnull),
+      mScriptObject(nsnull)
+{
+    NS_INIT_REFCNT();
+}
+
+nsRDFDOMNodeList::~nsRDFDOMNodeList(void)
+{
+    NS_IF_RELEASE(mElements);
+    delete mInner;
+}
+
+nsresult
+nsRDFDOMNodeList::Create(nsRDFDOMNodeList** aResult)
+{
+    NS_PRECONDITION(aResult != nsnull, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    nsRDFDOMNodeList* list = new nsRDFDOMNodeList();
+    if (! list)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    nsresult rv;
+    if (NS_FAILED(rv = list->Init())) {
+        delete list;
+        return rv;
+    }
+
+    NS_ADDREF(list);
+    *aResult = list;
+    return NS_OK;
+}
+
+
+////////////////////////////////////////////////////////////////////////
+// nsISupports interface
+
+NS_IMPL_ADDREF(nsRDFDOMNodeList);
+NS_IMPL_RELEASE(nsRDFDOMNodeList);
+
+nsresult
+nsRDFDOMNodeList::QueryInterface(REFNSIID aIID, void** aResult)
+{
+static NS_DEFINE_IID(kISupportsIID,          NS_ISUPPORTS_IID);
+static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
+
+    NS_PRECONDITION(aResult != nsnull, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    if (aIID.Equals(nsIDOMNodeList::GetIID()) ||
+        aIID.Equals(kISupportsIID)) {
+        *aResult = NS_STATIC_CAST(nsIDOMNodeList*, this);
+        NS_ADDREF(this);
+        return NS_OK;
+    }
+    else if (aIID.Equals(kIScriptObjectOwnerIID)) {
+        *aResult = NS_STATIC_CAST(nsIScriptObjectOwner*, this);
+        NS_ADDREF(this);
+        return NS_OK;
+    }
+    else if (aIID.Equals(nsIDOMHTMLCollection::GetIID())) {
+        // Aggregate this interface
+        if (! mInner) {
+            if (! (mInner = new RDFHTMLCollectionImpl(this)))
+                return NS_ERROR_OUT_OF_MEMORY;
+        }
+
+        return mInner->QueryInterface(aIID, aResult);
+    }
+    return NS_NOINTERFACE;
+}
+
+////////////////////////////////////////////////////////////////////////
+// nsIDOMNodeList interface
+
+NS_IMETHODIMP
+nsRDFDOMNodeList::GetLength(PRUint32* aLength)
+{
+    NS_ASSERTION(aLength != nsnull, "null ptr");
+    if (! aLength)
+        return NS_ERROR_NULL_POINTER;
+
+    PRUint32 cnt;
+    nsresult rv = mElements->Count(&cnt);
+    if (NS_FAILED(rv)) return rv;
+    *aLength = cnt;
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP
+nsRDFDOMNodeList::Item(PRUint32 aIndex, nsIDOMNode** aReturn)
+{
+    NS_PRECONDITION(aReturn != nsnull, "null ptr");
+    if (! aReturn)
+        return NS_ERROR_NULL_POINTER;
+
+    PRUint32 cnt;
+    nsresult rv = mElements->Count(&cnt);
+    if (NS_FAILED(rv)) return rv;
+    NS_PRECONDITION(aIndex < cnt, "invalid arg");
+    if (aIndex >= (PRUint32) cnt)
+        return NS_ERROR_INVALID_ARG;
+
+    // Cast is okay because we're in a closed system.
+    *aReturn = (nsIDOMNode*) mElements->ElementAt(aIndex);
+    return NS_OK;
+}
+
+
+////////////////////////////////////////////////////////////////////////
+// nsIScriptObjectOwner interface
+
+NS_IMETHODIMP
+nsRDFDOMNodeList::GetScriptObject(nsIScriptContext *aContext, void** aScriptObject)
+{
+    nsresult rv = NS_OK;
+    nsIScriptGlobalObject* global = aContext->GetGlobalObject();
+
+    if (nsnull == mScriptObject) {
+        nsIDOMScriptObjectFactory *factory;
+    
+        if (NS_SUCCEEDED(rv = nsServiceManager::GetService(kDOMScriptObjectFactoryCID,
+                                                           kIDOMScriptObjectFactoryIID,
+                                                           (nsISupports **)&factory))) {
+            rv = factory->NewScriptHTMLCollection(aContext, 
+                                                  (nsISupports*)(nsIDOMNodeList*)this, 
+                                                  global, 
+                                                  (void**)&mScriptObject);
+
+            nsServiceManager::ReleaseService(kDOMScriptObjectFactoryCID, factory);
+        }
+    }
+    *aScriptObject = mScriptObject;
+
+    NS_RELEASE(global);
+    return rv;
+}
+
+NS_IMETHODIMP
+nsRDFDOMNodeList::SetScriptObject(void* aScriptObject)
+{
+    mScriptObject = aScriptObject;
+    return NS_OK;
+}
+
+
+////////////////////////////////////////////////////////////////////////
+// Implementation methods
+
+nsresult
+nsRDFDOMNodeList::Init(void)
+{
+    nsresult rv;
+    if (NS_FAILED(rv = NS_NewISupportsArray(&mElements))) {
+        NS_ERROR("unable to create elements array");
+        return rv;
+    }
+
+    return NS_OK;
+}
+
+
+nsresult
+nsRDFDOMNodeList::AppendNode(nsIDOMNode* aNode)
+{
+    NS_PRECONDITION(aNode != nsnull, "null ptr");
+    if (! aNode)
+        return NS_ERROR_NULL_POINTER;
+
+    return mElements->AppendElement(aNode);
+}

mozilla/content/xul/content/src/nsRDFDOMNodeList.h

@@ -0,0 +1,58 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+#ifndef nsRDFDOMNodeList_h__
+#define nsRDFDOMNodeList_h__
+
+#include "nsIDOMNodeList.h"
+#include "nsIScriptObjectOwner.h"
+class nsIDOMNode;
+class nsISupportsArray;
+
+class nsRDFDOMNodeList : public nsIDOMNodeList,
+                         public nsIScriptObjectOwner
+{
+private:
+    nsISupports* mInner;
+    nsISupportsArray* mElements;
+    void* mScriptObject;
+
+    nsRDFDOMNodeList(void);
+    nsresult Init(void);
+
+public:
+    static nsresult Create(nsRDFDOMNodeList** aResult);
+    virtual ~nsRDFDOMNodeList(void);
+
+    // nsISupports interface
+    NS_DECL_ISUPPORTS
+
+    // nsIDOMNodeList interface
+    NS_DECL_IDOMNODELIST
+
+    // nsIScriptObjectOwner interface
+    NS_IMETHOD GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
+    NS_IMETHOD SetScriptObject(void* aScriptObject);
+
+    // Implementation methods
+    nsresult AppendNode(nsIDOMNode* aNode);
+};
+
+#endif // nsRDFDOMNodeList_h__
+

mozilla/content/xul/content/src/nsXULAttributes.cpp

@@ -0,0 +1,652 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+
+/*
+
+  A helper class used to implement attributes.
+
+*/
+
+
+/*
+ * Notes
+ *
+ * A lot of these methods delegate back to the original content node
+ * that created them. This is so that we can lazily produce attribute
+ * values from the RDF graph as they're asked for.
+ *
+ */
+
+#include "nsCOMPtr.h"
+#include "nsDOMCID.h"
+#include "nsIContent.h"
+#include "nsICSSParser.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMScriptObjectFactory.h"
+#include "nsINameSpaceManager.h"
+#include "nsIServiceManager.h"
+#include "nsIURL.h"
+#include "nsXULAttributes.h"
+#include "nsLayoutCID.h"
+
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+static NS_DEFINE_CID(kDOMScriptObjectFactoryCID, NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
+static NS_DEFINE_CID(kCSSParserCID, NS_CSSPARSER_CID);
+static NS_DEFINE_CID(kICSSParserIID, NS_ICSS_PARSER_IID);
+
+
+////////////////////////////////////////////////////////////////////////
+// nsXULAttribute
+
+nsXULAttribute::nsXULAttribute(nsIContent* aContent,
+                               PRInt32 aNameSpaceID,
+                               nsIAtom* aName,
+                               const nsString& aValue)
+    : mNameSpaceID(aNameSpaceID),
+      mName(aName),
+      mValue(aValue),
+      mContent(aContent),
+      mScriptObject(nsnull)
+{
+    NS_INIT_REFCNT();
+    NS_IF_ADDREF(aName);
+}
+
+nsXULAttribute::~nsXULAttribute()
+{
+    NS_IF_RELEASE(mName);
+}
+
+nsresult
+NS_NewXULAttribute(nsXULAttribute** aResult,
+                   nsIContent* aContent,
+                   PRInt32 aNameSpaceID,
+                   nsIAtom* aName,
+                   const nsString& aValue)
+{
+    NS_PRECONDITION(aResult != nsnull, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    if (! (*aResult = new nsXULAttribute(aContent, aNameSpaceID, aName, aValue)))
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(*aResult);
+    return NS_OK;
+}
+
+// nsISupports interface
+NS_IMPL_ADDREF(nsXULAttribute);
+NS_IMPL_RELEASE(nsXULAttribute);
+
+NS_IMETHODIMP
+nsXULAttribute::QueryInterface(REFNSIID aIID, void** aResult)
+{
+    NS_PRECONDITION(aResult != nsnull, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    if (aIID.Equals(nsIDOMAttr::GetIID()) ||
+        aIID.Equals(nsIDOMNode::GetIID()) ||
+        aIID.Equals(kISupportsIID)) {
+        *aResult = NS_STATIC_CAST(nsIDOMAttr*, this);
+        NS_ADDREF(this);
+        return NS_OK;
+    }
+    else if (aIID.Equals(nsIScriptObjectOwner::GetIID())) {
+        *aResult = NS_STATIC_CAST(nsIScriptObjectOwner*, this);
+        NS_ADDREF(this);
+        return NS_OK;
+    }
+    else {
+        *aResult = nsnull;
+        return NS_NOINTERFACE;
+    }
+}
+
+// nsIDOMNode interface
+
+NS_IMETHODIMP
+nsXULAttribute::GetNodeName(nsString& aNodeName)
+{
+    aNodeName.SetString(mName->GetUnicode());
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetNodeValue(nsString& aNodeValue)
+{
+    aNodeValue=mValue;
+    return NS_OK;
+}
+NS_IMETHODIMP
+nsXULAttribute::SetNodeValue(const nsString& aNodeValue)
+{
+    return SetValue(aNodeValue);
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetNodeType(PRUint16* aNodeType)
+{
+    *aNodeType = (PRUint16)nsIDOMNode::ATTRIBUTE_NODE;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetParentNode(nsIDOMNode** aParentNode)
+{
+    *aParentNode = nsnull;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetChildNodes(nsIDOMNodeList** aChildNodes)
+{
+    NS_NOTYETIMPLEMENTED("write me");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetFirstChild(nsIDOMNode** aFirstChild)
+{
+    NS_NOTYETIMPLEMENTED("write me");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetLastChild(nsIDOMNode** aLastChild)
+{
+    NS_NOTYETIMPLEMENTED("write me");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetPreviousSibling(nsIDOMNode** aPreviousSibling)
+{
+    *aPreviousSibling = nsnull;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetNextSibling(nsIDOMNode** aNextSibling)
+{
+    *aNextSibling = nsnull;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetAttributes(nsIDOMNamedNodeMap** aAttributes)
+{
+    *aAttributes = nsnull;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetOwnerDocument(nsIDOMDocument** aOwnerDocument)
+{
+    NS_NOTYETIMPLEMENTED("write me");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::InsertBefore(nsIDOMNode* aNewChild, nsIDOMNode* aRefChild, nsIDOMNode** aReturn)
+{
+    return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::ReplaceChild(nsIDOMNode* aNewChild, nsIDOMNode* aOldChild, nsIDOMNode** aReturn)
+{
+    return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::RemoveChild(nsIDOMNode* aOldChild, nsIDOMNode** aReturn)
+{
+    return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::AppendChild(nsIDOMNode* aNewChild, nsIDOMNode** aReturn)
+{
+    return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::HasChildNodes(PRBool* aReturn)
+{
+    NS_NOTYETIMPLEMENTED("write me");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::CloneNode(PRBool aDeep, nsIDOMNode** aReturn)
+{
+    NS_NOTYETIMPLEMENTED("write me");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+
+// nsIDOMAttr interface
+
+NS_IMETHODIMP
+nsXULAttribute::GetName(nsString& aName)
+{
+    aName.SetString(mName->GetUnicode());
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetSpecified(PRBool* aSpecified)
+{
+    // XXX this'll break when we make Clone() work
+    *aSpecified = PR_TRUE;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetValue(nsString& aValue)
+{
+    aValue=mValue;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::SetValue(const nsString& aValue)
+{
+    nsCOMPtr<nsIDOMElement> element( do_QueryInterface(mContent) );
+    if (element) {
+        nsAutoString qualifiedName;
+        GetQualifiedName(qualifiedName);
+        return element->SetAttribute(qualifiedName, aValue);
+    }
+    else {
+        return NS_ERROR_FAILURE;
+    }
+}
+
+
+// nsIScriptObjectOwner interface
+
+NS_IMETHODIMP
+nsXULAttribute::GetScriptObject(nsIScriptContext* aContext, void** aScriptObject)
+{
+    nsresult rv = NS_OK;
+    if (! mScriptObject) {
+        nsIDOMScriptObjectFactory *factory;
+    
+        rv = nsServiceManager::GetService(kDOMScriptObjectFactoryCID,
+                                          nsIDOMScriptObjectFactory::GetIID(),
+                                          (nsISupports **)&factory);
+
+        if (NS_FAILED(rv))
+            return rv;
+
+        rv = factory->NewScriptAttr(aContext, 
+                                    (nsISupports*)(nsIDOMAttr*) this,
+                                    (nsISupports*) mContent,
+                                    (void**) &mScriptObject);
+
+        nsServiceManager::ReleaseService(kDOMScriptObjectFactoryCID, factory);
+    }
+
+    *aScriptObject = mScriptObject;
+    return rv;
+}
+
+
+NS_IMETHODIMP
+nsXULAttribute::SetScriptObject(void *aScriptObject)
+{
+    mScriptObject = aScriptObject;
+    return NS_OK;
+}
+
+
+// Implementation methods
+
+void
+nsXULAttribute::GetQualifiedName(nsString& aQualifiedName)
+{
+    aQualifiedName.Truncate();
+    if ((mNameSpaceID != kNameSpaceID_None) &&
+        (mNameSpaceID != kNameSpaceID_Unknown)) {
+        nsresult rv;
+
+        nsIAtom* prefix;
+        rv = mContent->GetNameSpacePrefixFromId(mNameSpaceID, prefix);
+
+        if (NS_SUCCEEDED(rv) && (prefix != nsnull)) {
+            aQualifiedName.Append(prefix->GetUnicode());
+            aQualifiedName.Append(':');
+            NS_RELEASE(prefix);
+        }
+    }
+    aQualifiedName.Append(mName->GetUnicode());
+}
+
+
+////////////////////////////////////////////////////////////////////////
+// nsXULAttributes
+
+nsXULAttributes::nsXULAttributes(nsIContent* aContent)
+    : mContent(aContent),
+      mClassList(nsnull),
+      mStyleRule(nsnull),
+      mScriptObject(nsnull)
+{
+    NS_INIT_REFCNT();
+}
+
+
+nsXULAttributes::~nsXULAttributes()
+{
+    PRInt32 count = mAttributes.Count();
+    PRInt32 index;
+    for (index = 0; index < count; index++) {
+        nsXULAttribute* attr = (nsXULAttribute*)mAttributes.ElementAt(index);
+        NS_RELEASE(attr);
+    }
+}
+
+
+nsresult
+NS_NewXULAttributes(nsXULAttributes** aResult, nsIContent* aContent)
+{
+    NS_PRECONDITION(aResult != nsnull, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    if (! (*aResult = new nsXULAttributes(aContent)))
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(*aResult);
+    return NS_OK;
+}
+
+
+// nsISupports interface
+
+NS_IMPL_ADDREF(nsXULAttributes);
+NS_IMPL_RELEASE(nsXULAttributes);
+
+NS_IMETHODIMP
+nsXULAttributes::QueryInterface(REFNSIID aIID, void** aResult)
+{
+    NS_PRECONDITION(aResult != nsnull, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    if (aIID.Equals(nsIDOMNamedNodeMap::GetIID()) ||
+        aIID.Equals(kISupportsIID)) {
+        *aResult = NS_STATIC_CAST(nsIDOMNamedNodeMap*, this);
+        NS_ADDREF(this);
+        return NS_OK;
+    }
+    else if (aIID.Equals(nsIScriptObjectOwner::GetIID())) {
+        *aResult = NS_STATIC_CAST(nsIScriptObjectOwner*, this);
+        NS_ADDREF(this);
+        return NS_OK;
+    }
+    else {
+        *aResult = nsnull;
+        return NS_NOINTERFACE;
+    }
+}
+
+
+// nsIDOMNamedNodeMap interface
+
+NS_IMETHODIMP
+nsXULAttributes::GetLength(PRUint32* aLength)
+{
+    NS_PRECONDITION(aLength != nsnull, "null ptr");
+    if (! aLength)
+        return NS_ERROR_NULL_POINTER;
+
+    *aLength = mAttributes.Count();
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttributes::GetNamedItem(const nsString& aName, nsIDOMNode** aReturn)
+{
+    NS_PRECONDITION(aReturn != nsnull, "null ptr");
+    if (! aReturn)
+        return NS_ERROR_NULL_POINTER;
+
+    nsresult rv;
+    *aReturn = nsnull;
+
+    PRInt32 nameSpaceID;
+    nsIAtom* name;
+
+    if (NS_FAILED(rv = mContent->ParseAttributeString(aName, name, nameSpaceID)))
+        return rv;
+
+    // XXX doing this instead of calling mContent->GetAttribute() will
+    // make it a lot harder to lazily instantiate properties from the
+    // graph. The problem is, how else do we get the named item?
+    for (PRInt32 i = mAttributes.Count() - 1; i >= 0; --i) {
+        nsXULAttribute* attr = (nsXULAttribute*) mAttributes[i];
+        if (((nameSpaceID == attr->mNameSpaceID) ||
+             (nameSpaceID == kNameSpaceID_Unknown) ||
+             (nameSpaceID == kNameSpaceID_None)) &&
+            (name == attr->mName)) {
+            NS_ADDREF(attr);
+            *aReturn = attr;
+            break;
+        }
+    }
+
+    NS_RELEASE(name);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttributes::SetNamedItem(nsIDOMNode* aArg, nsIDOMNode** aReturn)
+{
+    NS_NOTYETIMPLEMENTED("write me");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsXULAttributes::RemoveNamedItem(const nsString& aName, nsIDOMNode** aReturn)
+{
+    nsCOMPtr<nsIDOMElement> element( do_QueryInterface(mContent) );
+    if (element) {
+        return element->RemoveAttribute(aName);
+        *aReturn = nsnull; // XXX should be the element we just removed
+        return NS_OK;
+    }
+    else {
+        return NS_ERROR_FAILURE;
+    }
+}
+
+NS_IMETHODIMP
+nsXULAttributes::Item(PRUint32 aIndex, nsIDOMNode** aReturn)
+{
+    *aReturn = (nsXULAttribute*) mAttributes[aIndex];
+    NS_IF_ADDREF(*aReturn);
+    return NS_OK;
+}
+
+
+
+
+// nsIScriptObjectOwner interface
+
+NS_IMETHODIMP
+nsXULAttributes::GetScriptObject(nsIScriptContext* aContext, void** aScriptObject)
+{
+    nsresult rv = NS_OK;
+    if (! mScriptObject) {
+        nsIDOMScriptObjectFactory *factory;
+    
+        rv = nsServiceManager::GetService(kDOMScriptObjectFactoryCID,
+                                          nsIDOMScriptObjectFactory::GetIID(),
+                                          (nsISupports **)&factory);
+
+        if (NS_FAILED(rv))
+            return rv;
+
+        rv = factory->NewScriptNamedNodeMap(aContext, 
+                                            (nsISupports*)(nsIDOMNamedNodeMap*) this, 
+                                            (nsISupports*) mContent,
+                                            (void**) &mScriptObject);
+
+        nsServiceManager::ReleaseService(kDOMScriptObjectFactoryCID, factory);
+    }
+
+    *aScriptObject = mScriptObject;
+    return rv;
+}
+
+NS_IMETHODIMP
+nsXULAttributes::SetScriptObject(void *aScriptObject)
+{
+    mScriptObject = aScriptObject;
+    return NS_OK;
+}
+
+// Implementation methods
+
+nsresult 
+nsXULAttributes::GetClasses(nsVoidArray& aArray) const
+{
+  aArray.Clear();
+  const nsClassList* classList = mClassList;
+  while (nsnull != classList) {
+    aArray.AppendElement(classList->mAtom); // NOTE atom is not addrefed
+    classList = classList->mNext;
+  }
+  return NS_OK;
+}
+
+nsresult 
+nsXULAttributes::HasClass(nsIAtom* aClass) const
+{
+  const nsClassList* classList = mClassList;
+  while (nsnull != classList) {
+    if (classList->mAtom == aClass) {
+      return NS_OK;
+    }
+    classList = classList->mNext;
+  }
+  return NS_COMFALSE;
+}
+
+nsresult nsXULAttributes::UpdateClassList(const nsString& aValue)
+{
+  if (mClassList != nsnull)
+  {
+    delete mClassList;
+    mClassList = nsnull;
+  }
+
+  if (aValue != "")
+    ParseClasses(aValue, &mClassList);
+  
+  return NS_OK;
+}
+
+nsresult nsXULAttributes::UpdateStyleRule(nsIURL* aDocURL, const nsString& aValue)
+{
+    if (aValue == "")
+    {
+      // XXX: Removing the rule. Is this sufficient?
+      NS_IF_RELEASE(mStyleRule);
+      mStyleRule = nsnull;
+      return NS_OK;
+    }
+
+    nsICSSParser* css;
+    nsresult result = nsComponentManager::CreateInstance(kCSSParserCID,
+                                                         nsnull,
+                                                         kICSSParserIID,
+                                                         (void**)&css);
+    if (NS_OK != result) {
+      return result;
+    }
+
+    nsIStyleRule* rule;
+    result = css->ParseDeclarations(aValue, aDocURL, rule);
+    //NS_IF_RELEASE(docURL);
+    
+    if ((NS_OK == result) && (nsnull != rule)) {
+      mStyleRule = rule; //Addrefed already during parse, so don't need to addref again.
+      //result = SetHTMLAttribute(aAttribute, nsHTMLValue(rule), aNotify);
+    }
+    //else {
+    //  result = SetHTMLAttribute(aAttribute, nsHTMLValue(aValue), aNotify);
+    //}
+    NS_RELEASE(css);
+    return NS_OK;
+}
+
+nsresult nsXULAttributes::GetInlineStyleRule(nsIStyleRule*& aRule)
+{
+  nsresult result = NS_ERROR_NULL_POINTER;
+  if (mStyleRule != nsnull)
+  {
+    aRule = mStyleRule;
+    NS_ADDREF(aRule);
+    result = NS_OK;
+  }
+
+  return result;
+}
+
+
+void
+nsXULAttributes::ParseClasses(const nsString& aClassString, nsClassList** aClassList)
+{
+static const PRUnichar kNullCh = PRUnichar('\0');
+
+  NS_ASSERTION(nsnull == *aClassList, "non null start list");
+
+  nsAutoString  classStr(aClassString);  // copy to work buffer
+  classStr.Append(kNullCh);  // put an extra null at the end
+
+  PRUnichar* start = (PRUnichar*)(const PRUnichar*)classStr.GetUnicode();
+  PRUnichar* end   = start;
+
+  while (kNullCh != *start) {
+    while ((kNullCh != *start) && nsString::IsSpace(*start)) {  // skip leading space
+      start++;
+    }
+    end = start;
+
+    while ((kNullCh != *end) && (PR_FALSE == nsString::IsSpace(*end))) { // look for space or end
+      end++;
+    }
+    *end = kNullCh; // end string here
+
+    if (start < end) {
+      *aClassList = new nsClassList(NS_NewAtom(start));
+      aClassList = &((*aClassList)->mNext);
+    }
+
+    start = ++end;
+  }
+}
+

mozilla/content/xul/content/src/nsXULAttributes.h

@@ -0,0 +1,180 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+
+/*
+
+  A set of helper classes used to implement attributes.
+
+*/
+
+#ifndef nsXULAttributes_h__
+#define nsXULAttributes_h__
+
+#include "nsIDOMAttr.h"
+#include "nsIDOMNamedNodeMap.h"
+#include "nsIScriptObjectOwner.h"
+#include "nsIStyleRule.h"
+#include "nsString.h"
+#include "nsIAtom.h"
+#include "nsVoidArray.h"
+
+class nsIURL;
+
+struct nsClassList {
+  nsClassList(nsIAtom* aAtom)
+    : mAtom(aAtom),
+      mNext(nsnull)
+  {
+  }
+  nsClassList(const nsClassList& aCopy)
+    : mAtom(aCopy.mAtom),
+      mNext(nsnull)
+  {
+    NS_ADDREF(mAtom);
+    if (nsnull != aCopy.mNext) {
+      mNext = new nsClassList(*(aCopy.mNext));
+    }
+  }
+  ~nsClassList(void)
+  {
+    NS_RELEASE(mAtom);
+    if (nsnull != mNext) {
+      delete mNext;
+    }
+  }
+
+  nsIAtom*      mAtom;
+  nsClassList*  mNext;
+};
+
+////////////////////////////////////////////////////////////////////////
+
+class nsXULAttribute : public nsIDOMAttr,
+                       public nsIScriptObjectOwner
+{
+private:
+    nsXULAttribute(nsIContent* aContent,
+                   PRInt32 aNameSpaceID,
+                   nsIAtom* aName,
+                   const nsString& aValue);
+
+    virtual ~nsXULAttribute();
+
+    friend nsresult
+    NS_NewXULAttribute(nsXULAttribute** aResult,
+                       nsIContent* aContent,
+                       PRInt32 aNameSpaceID,
+                       nsIAtom* aName,
+                       const nsString& aValue);
+
+public:
+
+    // nsISupports interface
+    NS_DECL_ISUPPORTS
+
+    // nsIDOMNode interface
+    NS_DECL_IDOMNODE
+
+    // nsIDOMAttr interface
+    NS_DECL_IDOMATTR
+
+    // nsIScriptObjectOwner interface
+    NS_IMETHOD GetScriptObject(nsIScriptContext* aContext, void** aScriptObject);
+    NS_IMETHOD SetScriptObject(void *aScriptObject);
+
+    // Implementation methods
+    void GetQualifiedName(nsString& aAttributeName);
+
+    PRInt32 GetNameSpaceID();
+    nsIAtom* GetName();
+    const nsString& GetValue();
+
+    // Publicly exposed to make life easier. This is a private class
+    // anyway.
+    PRInt32     mNameSpaceID;
+    nsIAtom*    mName;
+    nsString    mValue;
+
+private:
+    nsIContent* mContent;
+    void*       mScriptObject;
+};
+
+nsresult
+NS_NewXULAttribute(nsXULAttribute** aResult,
+                   nsIContent* aContent,
+                   PRInt32 aNameSpaceID,
+                   nsIAtom* aName,
+                   const nsString& aValue);
+
+////////////////////////////////////////////////////////////////////////
+
+class nsXULAttributes : public nsIDOMNamedNodeMap,
+                        public nsIScriptObjectOwner
+{
+public:
+    // nsISupports interface
+    NS_DECL_ISUPPORTS
+
+    // nsIDOMNamedNodeMap interface
+    NS_DECL_IDOMNAMEDNODEMAP
+
+    // nsIScriptObjectOwner interface
+    NS_IMETHOD GetScriptObject(nsIScriptContext* aContext, void** aScriptObject);
+    NS_IMETHOD SetScriptObject(void *aScriptObject);
+
+    // Implementation methods
+    // VoidArray Helpers
+    PRInt32 Count() { return mAttributes.Count(); };
+    nsXULAttribute* ElementAt(PRInt32 i) { return (nsXULAttribute*)mAttributes.ElementAt(i); };
+    void AppendElement(nsXULAttribute* aElement) { mAttributes.AppendElement((void*)aElement); };
+    void RemoveElementAt(PRInt32 aIndex) { mAttributes.RemoveElementAt(aIndex); };
+
+    // Style Helpers
+    nsresult GetClasses(nsVoidArray& aArray) const;
+    nsresult HasClass(nsIAtom* aClass) const;
+
+    nsresult UpdateClassList(const nsString& aValue);
+    nsresult UpdateStyleRule(nsIURL* aDocURL, const nsString& aValue);
+    nsresult GetInlineStyleRule(nsIStyleRule*& aRule);
+
+private:
+    friend nsresult
+    NS_NewXULAttributes(nsXULAttributes** aResult, nsIContent* aContent);
+
+    nsXULAttributes(nsIContent* aContent);
+    virtual ~nsXULAttributes();
+
+    static void
+    ParseClasses(const nsString& aClassString, nsClassList** aClassList);
+
+    nsIContent*   mContent;
+    nsClassList*  mClassList;
+    nsIStyleRule* mStyleRule;
+    nsVoidArray   mAttributes;
+    void*         mScriptObject;
+};
+
+
+nsresult
+NS_NewXULAttributes(nsXULAttributes** aResult, nsIContent* aContent);
+
+#endif // nsXULAttributes_h__
+

mozilla/content/xul/content/src/nsXULElement.h

@@ -0,0 +1,71 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+#ifndef nsXULElement_h__
+#define nsXULElement_h__
+
+#include "nsIDOMXULElement.h"
+class nsXULElement : public nsISupports
+{
+protected:
+    nsIDOMXULElement* mOuter;
+    nsXULElement(nsIDOMXULElement* aOuter) : mOuter(aOuter) {}
+    
+public:
+    virtual ~nsXULElement() {};
+
+    // nsISupports interface. Subclasses should use the
+    // NS_DECL/IMPL_ISUPPORTS_INHERITED macros to implement the
+    // nsISupports interface.
+    NS_IMETHOD_(nsrefcnt) AddRef() {
+        return mOuter->AddRef();
+    }
+
+    NS_IMETHOD_(nsrefcnt) Release() {
+        return mOuter->Release();
+    }
+
+    NS_IMETHOD QueryInterface(REFNSIID aIID, void** aResult) {
+        return mOuter->QueryInterface(aIID, aResult);
+    }
+};
+
+#define NS_IMPL_XULELEMENT_ISUPPORTS                            \
+    NS_IMETHOD_(nsrefcnt) AddRef() {                            \
+        return mOuter->AddRef();                                \
+    }                                                           \
+                                                                \
+    NS_IMETHOD_(nsrefcnt) Release() {                           \
+        return mOuter->Release();                               \
+    }                                                           \
+                                                                \
+    NS_IMETHOD QueryInterface(REFNSIID aIID, void** aResult) {  \
+        if (aIID.Equals(GetDOMIID())) {                         \
+            *aResult = this;                                    \
+            NS_ADDREF(this);                                    \
+            return NS_OK;                                       \
+        }                                                       \
+        else {                                                  \
+            return mOuter->QueryInterface(aIID, aResult);       \
+        }                                                       \
+    }
+
+
+
+#endif // nsXULElement_h__

mozilla/content/xul/content/src/nsXULPopupListener.cpp

@@ -0,0 +1,323 @@
+/* -*- 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 file provides the implementation for the sort service manager.
+ */
+
+#include "nsCOMPtr.h"
+#include "nsIDOMElement.h"
+#include "nsIXULPopupListener.h"
+#include "nsIDOMMouseListener.h"
+#include "nsIDOMFocusListener.h"
+#include "nsRDFCID.h"
+
+#include "nsIScriptGlobalObject.h"
+#include "nsIDOMWindow.h"
+#include "nsIScriptContextOwner.h"
+#include "nsIDOMXULDocument.h"
+#include "nsIDocument.h"
+#include "nsIContent.h"
+#include "nsIDOMUIEvent.h"
+
+////////////////////////////////////////////////////////////////////////
+
+static NS_DEFINE_IID(kXULPopupListenerCID,      NS_XULPOPUPLISTENER_CID);
+static NS_DEFINE_IID(kIXULPopupListenerIID,     NS_IXULPOPUPLISTENER_IID);
+static NS_DEFINE_IID(kISupportsIID,           NS_ISUPPORTS_IID);
+
+static NS_DEFINE_IID(kIDomNodeIID,            NS_IDOMNODE_IID);
+static NS_DEFINE_IID(kIDomElementIID,         NS_IDOMELEMENT_IID);
+static NS_DEFINE_IID(kIDomEventListenerIID,   NS_IDOMEVENTLISTENER_IID);
+
+////////////////////////////////////////////////////////////////////////
+// PopupListenerImpl
+//
+//   This is the popup listener implementation for popup menus, context menus,
+//   and tooltips.
+//
+class XULPopupListenerImpl : public nsIXULPopupListener,
+                             public nsIDOMMouseListener,
+                             public nsIDOMFocusListener
+{
+public:
+    XULPopupListenerImpl(void);
+    virtual ~XULPopupListenerImpl(void);
+
+public:
+    // nsISupports
+    NS_DECL_ISUPPORTS
+
+    // nsIXULPopupListener
+    NS_IMETHOD Init(nsIDOMElement* aElement, const XULPopupType& popupType);
+
+    // nsIDOMMouseListener
+    virtual nsresult MouseDown(nsIDOMEvent* aMouseEvent);
+    virtual nsresult MouseUp(nsIDOMEvent* aMouseEvent) { return NS_OK; };
+    virtual nsresult MouseClick(nsIDOMEvent* aMouseEvent) { return NS_OK; };
+    virtual nsresult MouseDblClick(nsIDOMEvent* aMouseEvent) { return NS_OK; };
+    virtual nsresult MouseOver(nsIDOMEvent* aMouseEvent) { return NS_OK; };
+    virtual nsresult MouseOut(nsIDOMEvent* aMouseEvent) { return NS_OK; };
+
+    // nsIDOMFocusListener
+    virtual nsresult Focus(nsIDOMEvent* aEvent) { return NS_OK; };
+    virtual nsresult Blur(nsIDOMEvent* aEvent);
+
+    // nsIDOMEventListener
+    virtual nsresult HandleEvent(nsIDOMEvent* anEvent) { return NS_OK; };
+
+protected:
+    virtual nsresult LaunchPopup(nsIDOMEvent* anEvent);
+
+private:
+    nsIDOMElement* element; // Weak reference. The element will go away first.
+    XULPopupType popupType;
+};
+
+////////////////////////////////////////////////////////////////////////
+
+XULPopupListenerImpl::XULPopupListenerImpl(void)
+{
+	NS_INIT_REFCNT();
+	
+}
+
+XULPopupListenerImpl::~XULPopupListenerImpl(void)
+{
+}
+
+NS_IMPL_ADDREF(XULPopupListenerImpl)
+NS_IMPL_RELEASE(XULPopupListenerImpl)
+
+NS_IMETHODIMP
+XULPopupListenerImpl::QueryInterface(REFNSIID iid, void** result)
+{
+    if (! result)
+        return NS_ERROR_NULL_POINTER;
+
+    *result = nsnull;
+    if (iid.Equals(nsIXULPopupListener::GetIID())) {
+        *result = NS_STATIC_CAST(nsIXULPopupListener*, this);
+        NS_ADDREF_THIS();
+        return NS_OK;
+    }
+    else if (iid.Equals(nsIDOMMouseListener::GetIID())) {
+        *result = NS_STATIC_CAST(nsIDOMMouseListener*, this);
+        NS_ADDREF_THIS();
+        return NS_OK;
+    }
+    else if (iid.Equals(nsIDOMFocusListener::GetIID())) {
+        *result = NS_STATIC_CAST(nsIDOMMouseListener*, this);
+        NS_ADDREF_THIS();
+        return NS_OK;
+    }
+    else if (iid.Equals(kIDomEventListenerIID)) {
+        *result = (nsIDOMEventListener*)(nsIDOMMouseListener*)this;
+        NS_ADDREF_THIS();
+        return NS_OK;
+    }
+
+    return NS_NOINTERFACE;
+}
+
+NS_IMETHODIMP
+XULPopupListenerImpl::Init(nsIDOMElement* aElement, const XULPopupType& popup)
+{
+  element = aElement; // Weak reference. Don't addref it.
+  popupType = popup;
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////
+// nsIDOMMouseListener
+
+nsresult
+XULPopupListenerImpl::MouseDown(nsIDOMEvent* aMouseEvent)
+{
+  PRUint32 button;
+
+  nsCOMPtr<nsIDOMUIEvent>uiEvent;
+  uiEvent = do_QueryInterface(aMouseEvent);
+  if (!uiEvent) {
+    //non-ui event passed in.  bad things.
+    return NS_OK;
+  }
+
+  switch (popupType) {
+    case eXULPopupType_popup:
+      // Check for left mouse button down
+      uiEvent->GetButton(&button);
+      if (button == 1) {
+        // Time to launch a popup menu.
+        LaunchPopup(aMouseEvent);
+      }
+      break;
+    case eXULPopupType_context:
+      // Check for right mouse button down
+      uiEvent->GetButton(&button);
+      // XXX: Handle Mac 
+      if (button == 3) {
+        // Time to launch a context menu.
+        LaunchPopup(aMouseEvent);
+      }
+      break;
+  }
+  return NS_OK;
+}
+
+nsresult
+XULPopupListenerImpl::LaunchPopup(nsIDOMEvent* anEvent)
+{
+  nsresult rv = NS_OK;
+
+  nsString type("popup");
+  if (eXULPopupType_context == popupType)
+    type = "context";
+
+  nsString identifier;
+  element->GetAttribute(type, identifier);
+
+  if (identifier == "")
+    return rv;
+
+  // Try to find the popup content.
+  nsCOMPtr<nsIDocument> document;
+  nsCOMPtr<nsIContent> content = do_QueryInterface(element);
+  if (NS_FAILED(rv = content->GetDocument(*getter_AddRefs(document)))) {
+    NS_ERROR("Unable to retrieve the document.");
+    return rv;
+  }
+
+  // Turn the document into a XUL document so we can use getElementById
+  nsCOMPtr<nsIDOMXULDocument> xulDocument = do_QueryInterface(document);
+  if (xulDocument == nsnull) {
+    NS_ERROR("Popup attached to an element that isn't in XUL!");
+    return NS_ERROR_FAILURE;
+  }
+
+  // XXX Handle the _child case for popups and context menus!
+
+  // Use getElementById to obtain the popup content.
+  nsCOMPtr<nsIDOMElement> popupContent;
+  if (NS_FAILED(rv = xulDocument->GetElementById(identifier, getter_AddRefs(popupContent)))) {
+    NS_ERROR("GetElementById had some kind of spasm.");
+    return rv;
+  }
+
+  if (popupContent == nsnull) {
+    // Gracefully fail in this case.
+    return NS_OK;
+  }
+
+  // We have some popup content. Obtain our window.
+  nsIScriptContextOwner* owner = document->GetScriptContextOwner();
+  nsCOMPtr<nsIScriptContext> context;
+  if (NS_OK == owner->GetScriptContext(getter_AddRefs(context))) {
+    nsIScriptGlobalObject* global = context->GetGlobalObject();
+    if (global) {
+      // Get the DOM window
+      nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(global);
+      if (domWindow != nsnull) {
+        // Find out if we're anchored.
+        nsString anchorAlignment;
+        element->GetAttribute("popupanchor", anchorAlignment);
+
+        nsString popupAlignment("topleft");
+        element->GetAttribute("popupalign", popupAlignment);
+
+		    // Set the popup in the document for the duration of this call.
+		    xulDocument->SetPopup(element);
+        if (anchorAlignment == "") {
+          // We aren't anchored. Create on the point.
+          // Retrieve our x and y position.
+          nsCOMPtr<nsIDOMUIEvent>uiEvent;
+          uiEvent = do_QueryInterface(anEvent);
+          if (!uiEvent) {
+            //non-ui event passed in.  bad things.
+            return NS_OK;
+          }
+
+          PRInt32 xPos;
+    		  PRInt32 yPos;
+          uiEvent->GetScreenX(&xPos); 
+          uiEvent->GetScreenY(&yPos); 
+          xPos = 50; // For now, hardcode to (50,50), since screen doesn't work.
+          yPos = 50;
+                 
+          domWindow->CreatePopup(element, popupContent, 
+                               xPos, yPos, 
+                               type, popupAlignment);
+        }
+        else {
+          // We're anchored. Pass off to the window, and let it figure out
+          // from the frame where it wants to put us.
+          domWindow->CreateAnchoredPopup(element, popupContent,
+                                         anchorAlignment, type, popupAlignment);
+        }
+		    xulDocument->SetPopup(nsnull);
+      }
+      NS_RELEASE(global);
+    }
+  }
+  NS_IF_RELEASE(owner);
+
+  return NS_OK;
+}
+
+nsresult
+XULPopupListenerImpl::Blur(nsIDOMEvent* aMouseEvent)
+{
+  nsresult rv = NS_OK;
+
+  // Try to find the popup content.
+  nsCOMPtr<nsIDocument> document;
+  nsCOMPtr<nsIContent> content = do_QueryInterface(element);
+  if (NS_FAILED(rv = content->GetDocument(*getter_AddRefs(document)))) {
+    NS_ERROR("Unable to retrieve the document.");
+    return rv;
+  }
+
+  // Blur events don't bubble, so this means our window lost focus.
+  // Close up, baby.
+  // We have some popup content. Obtain our window.
+  nsIScriptContextOwner* owner = document->GetScriptContextOwner();
+  nsCOMPtr<nsIScriptContext> context;
+  if (NS_OK == owner->GetScriptContext(getter_AddRefs(context))) {
+    nsIScriptGlobalObject* global = context->GetGlobalObject();
+    if (global) {
+      // Get the DOM window
+      nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(global);
+      domWindow->Close();
+    }
+  }
+
+  return rv;
+}
+
+////////////////////////////////////////////////////////////////
+nsresult
+NS_NewXULPopupListener(nsIXULPopupListener** pop)
+{
+    XULPopupListenerImpl* popup = new XULPopupListenerImpl();
+    if (!popup)
+      return NS_ERROR_OUT_OF_MEMORY;
+    
+    NS_ADDREF(popup);
+    *pop = popup;
+    return NS_OK;
+}

mozilla/content/xul/content/src/nsXULTreeElement.cpp

@@ -0,0 +1,55 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+#include "nsCOMPtr.h"
+#include "nsIRDFCompositeDataSource.h"
+#include "nsIServiceManager.h"
+#include "nsRDFCID.h"
+#include "nsXULTreeElement.h"
+
+NS_IMPL_ISUPPORTS_INHERITED(nsXULTreeElement, nsXULElement, nsIDOMXULTreeElement);
+
+NS_IMETHODIMP
+nsXULTreeElement::GetDatabase(nsIRDFCompositeDataSource** aDatabase)
+{
+    NS_PRECONDITION(aDatabase != nsnull, "null ptr");
+    if (! aDatabase)
+        return NS_ERROR_NULL_POINTER;
+
+    NS_IF_ADDREF(mDatabase);
+    *aDatabase = mDatabase;
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP
+nsXULTreeElement::SetDatabase(nsIRDFCompositeDataSource* aDatabase)
+{
+    // XXX maybe someday you'll be allowed to change it.
+    NS_PRECONDITION(mDatabase == nsnull, "already initialized");
+    if (mDatabase)
+        return NS_ERROR_ALREADY_INITIALIZED;
+
+    mDatabase = aDatabase;
+    NS_IF_ADDREF(aDatabase);
+
+    // XXX reconstruct the entire tree now!
+
+    return NS_OK;
+}

mozilla/content/xul/content/src/nsXULTreeElement.h

@@ -0,0 +1,60 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+#ifndef nsXULTreeElement_h__
+#define nsXULTreeElement_h__
+
+#include "nsXULElement.h"
+#include "nsIDOMXULTreeElement.h"
+#include "nsIRDFCompositeDataSource.h"
+
+class nsXULTreeElement : public nsXULElement,
+                         public nsIDOMXULTreeElement
+{
+private:
+    nsIRDFCompositeDataSource* mDatabase;
+
+public:
+    nsXULTreeElement(nsIDOMXULElement* aOuter)
+        : nsXULElement(aOuter),
+          mDatabase(nsnull)
+    {
+    }
+
+    NS_DECL_ISUPPORTS_INHERITED
+
+    // nsIDOMNode interface
+    NS_FORWARD_IDOMNODE(mOuter->);
+
+    // nsIDOMElement interface
+    NS_FORWARD_IDOMELEMENT(mOuter->);
+
+    // nsIDOMXULElement interface
+    NS_FORWARD_IDOMXULELEMENT(mOuter->);
+
+    // nsIDOMXULTreeElement interface
+    NS_DECL_IDOMXULTREEELEMENT
+
+    virtual const nsIID& GetDOMIID() {
+        return nsIDOMXULTreeElement::GetIID();
+    }
+};
+
+
+#endif // nsXULTreeElement_h__

mozilla/dom/public/idl/xul/XULDocument.idl

@@ -0,0 +1,10 @@
+interface XULDocument : Document {
+
+/* IID: { 0x17ddd8c0, 0xc5f8, 0x11d2, \
+        { 0xa6, 0xae, 0x0, 0x10, 0x4b, 0xde, 0x60, 0x48 } } */
+
+	attribute Element popup;
+
+    Element getElementById(in DOMString id);
+	NodeList getElementsByAttribute(in DOMString name, in DOMString value);
+};

mozilla/dom/public/idl/xul/XULElement.idl

@@ -0,0 +1,12 @@
+interface XULElement : Element {
+
+/* IID: { 0x574ed81, 0xc088, 0x11d2, \
+  { 0x96, 0xed, 0x0, 0x10, 0x4b, 0x7b, 0x7d, 0xeb } } */
+        readonly attribute xpidl nsIRDFResource resource;
+
+        void addBroadcastListener(in DOMString attr, in Element element);
+        void removeBroadcastListener(in DOMString attr, in Element element);
+	void doCommand();
+
+	NodeList getElementsByAttribute(in DOMString name, in DOMString value);
+};

mozilla/dom/public/idl/xul/XULTreeElement.idl

@@ -0,0 +1,5 @@
+interface XULTreeElement : XULElement {
+/* IID: { 0xa6cf90ec, 0x15b3, 0x11d2, \
+    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} } */
+        attribute xpidl nsIRDFCompositeDataSource database;
+};

mozilla/dom/public/xul/nsIDOMXULDocument.h

@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#ifndef nsIDOMXULDocument_h__
+#define nsIDOMXULDocument_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIScriptContext.h"
+#include "nsIDOMDocument.h"
+
+class nsIDOMElement;
+class nsIDOMNodeList;
+
+#define NS_IDOMXULDOCUMENT_IID \
+ { 0x17ddd8c0, 0xc5f8, 0x11d2, \
+        { 0xa6, 0xae, 0x0, 0x10, 0x4b, 0xde, 0x60, 0x48 } } 
+
+class nsIDOMXULDocument : public nsIDOMDocument {
+public:
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMXULDOCUMENT_IID; return iid; }
+
+  NS_IMETHOD    GetPopup(nsIDOMElement** aPopup)=0;
+  NS_IMETHOD    SetPopup(nsIDOMElement* aPopup)=0;
+
+  NS_IMETHOD    GetElementById(const nsString& aId, nsIDOMElement** aReturn)=0;
+
+  NS_IMETHOD    GetElementsByAttribute(const nsString& aName, const nsString& aValue, nsIDOMNodeList** aReturn)=0;
+};
+
+
+#define NS_DECL_IDOMXULDOCUMENT   \
+  NS_IMETHOD    GetPopup(nsIDOMElement** aPopup);  \
+  NS_IMETHOD    SetPopup(nsIDOMElement* aPopup);  \
+  NS_IMETHOD    GetElementById(const nsString& aId, nsIDOMElement** aReturn);  \
+  NS_IMETHOD    GetElementsByAttribute(const nsString& aName, const nsString& aValue, nsIDOMNodeList** aReturn);  \
+
+
+
+#define NS_FORWARD_IDOMXULDOCUMENT(_to)  \
+  NS_IMETHOD    GetPopup(nsIDOMElement** aPopup) { return _to GetPopup(aPopup); } \
+  NS_IMETHOD    SetPopup(nsIDOMElement* aPopup) { return _to SetPopup(aPopup); } \
+  NS_IMETHOD    GetElementById(const nsString& aId, nsIDOMElement** aReturn) { return _to GetElementById(aId, aReturn); }  \
+  NS_IMETHOD    GetElementsByAttribute(const nsString& aName, const nsString& aValue, nsIDOMNodeList** aReturn) { return _to GetElementsByAttribute(aName, aValue, aReturn); }  \
+
+
+extern "C" NS_DOM nsresult NS_InitXULDocumentClass(nsIScriptContext *aContext, void **aPrototype);
+
+extern "C" NS_DOM nsresult NS_NewScriptXULDocument(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
+
+#endif // nsIDOMXULDocument_h__

mozilla/dom/public/xul/nsIDOMXULElement.h

@@ -0,0 +1,73 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#ifndef nsIDOMXULElement_h__
+#define nsIDOMXULElement_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIScriptContext.h"
+#include "nsIDOMElement.h"
+
+class nsIDOMElement;
+class nsIRDFResource;
+class nsIDOMNodeList;
+
+#define NS_IDOMXULELEMENT_IID \
+ { 0x574ed81, 0xc088, 0x11d2, \
+  { 0x96, 0xed, 0x0, 0x10, 0x4b, 0x7b, 0x7d, 0xeb } } 
+
+class nsIDOMXULElement : public nsIDOMElement {
+public:
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMXULELEMENT_IID; return iid; }
+
+  NS_IMETHOD    GetResource(nsIRDFResource** aResource)=0;
+
+  NS_IMETHOD    AddBroadcastListener(const nsString& aAttr, nsIDOMElement* aElement)=0;
+
+  NS_IMETHOD    RemoveBroadcastListener(const nsString& aAttr, nsIDOMElement* aElement)=0;
+
+  NS_IMETHOD    DoCommand()=0;
+
+  NS_IMETHOD    GetElementsByAttribute(const nsString& aName, const nsString& aValue, nsIDOMNodeList** aReturn)=0;
+};
+
+
+#define NS_DECL_IDOMXULELEMENT   \
+  NS_IMETHOD    GetResource(nsIRDFResource** aResource);  \
+  NS_IMETHOD    AddBroadcastListener(const nsString& aAttr, nsIDOMElement* aElement);  \
+  NS_IMETHOD    RemoveBroadcastListener(const nsString& aAttr, nsIDOMElement* aElement);  \
+  NS_IMETHOD    DoCommand();  \
+  NS_IMETHOD    GetElementsByAttribute(const nsString& aName, const nsString& aValue, nsIDOMNodeList** aReturn);  \
+
+
+
+#define NS_FORWARD_IDOMXULELEMENT(_to)  \
+  NS_IMETHOD    GetResource(nsIRDFResource** aResource) { return _to GetResource(aResource); } \
+  NS_IMETHOD    AddBroadcastListener(const nsString& aAttr, nsIDOMElement* aElement) { return _to AddBroadcastListener(aAttr, aElement); }  \
+  NS_IMETHOD    RemoveBroadcastListener(const nsString& aAttr, nsIDOMElement* aElement) { return _to RemoveBroadcastListener(aAttr, aElement); }  \
+  NS_IMETHOD    DoCommand() { return _to DoCommand(); }  \
+  NS_IMETHOD    GetElementsByAttribute(const nsString& aName, const nsString& aValue, nsIDOMNodeList** aReturn) { return _to GetElementsByAttribute(aName, aValue, aReturn); }  \
+
+
+extern "C" NS_DOM nsresult NS_InitXULElementClass(nsIScriptContext *aContext, void **aPrototype);
+
+extern "C" NS_DOM nsresult NS_NewScriptXULElement(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
+
+#endif // nsIDOMXULElement_h__

mozilla/dom/public/xul/nsIDOMXULTreeElement.h

@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#ifndef nsIDOMXULTreeElement_h__
+#define nsIDOMXULTreeElement_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIScriptContext.h"
+#include "nsIDOMXULElement.h"
+
+class nsIRDFCompositeDataSource;
+
+#define NS_IDOMXULTREEELEMENT_IID \
+ { 0xa6cf90ec, 0x15b3, 0x11d2, \
+    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} } 
+
+class nsIDOMXULTreeElement : public nsIDOMXULElement {
+public:
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMXULTREEELEMENT_IID; return iid; }
+
+  NS_IMETHOD    GetDatabase(nsIRDFCompositeDataSource** aDatabase)=0;
+  NS_IMETHOD    SetDatabase(nsIRDFCompositeDataSource* aDatabase)=0;
+};
+
+
+#define NS_DECL_IDOMXULTREEELEMENT   \
+  NS_IMETHOD    GetDatabase(nsIRDFCompositeDataSource** aDatabase);  \
+  NS_IMETHOD    SetDatabase(nsIRDFCompositeDataSource* aDatabase);  \
+
+
+
+#define NS_FORWARD_IDOMXULTREEELEMENT(_to)  \
+  NS_IMETHOD    GetDatabase(nsIRDFCompositeDataSource** aDatabase) { return _to GetDatabase(aDatabase); } \
+  NS_IMETHOD    SetDatabase(nsIRDFCompositeDataSource* aDatabase) { return _to SetDatabase(aDatabase); } \
+
+
+extern "C" NS_DOM nsresult NS_InitXULTreeElementClass(nsIScriptContext *aContext, void **aPrototype);
+
+extern "C" NS_DOM nsresult NS_NewScriptXULTreeElement(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
+
+#endif // nsIDOMXULTreeElement_h__

mozilla/dom/src/xul/nsJSXULDocument.cpp

@@ -0,0 +1,386 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#include "jsapi.h"
+#include "nsJSUtils.h"
+#include "nscore.h"
+#include "nsIScriptContext.h"
+#include "nsIJSScriptObject.h"
+#include "nsIScriptObjectOwner.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIPtr.h"
+#include "nsString.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMXULDocument.h"
+#include "nsIDOMNodeList.h"
+
+
+static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
+static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
+static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
+static NS_DEFINE_IID(kIElementIID, NS_IDOMELEMENT_IID);
+static NS_DEFINE_IID(kIXULDocumentIID, NS_IDOMXULDOCUMENT_IID);
+static NS_DEFINE_IID(kINodeListIID, NS_IDOMNODELIST_IID);
+
+NS_DEF_PTR(nsIDOMElement);
+NS_DEF_PTR(nsIDOMXULDocument);
+NS_DEF_PTR(nsIDOMNodeList);
+
+//
+// XULDocument property ids
+//
+enum XULDocument_slots {
+  XULDOCUMENT_POPUP = -1
+};
+
+/***********************************************************************/
+//
+// XULDocument Properties Getter
+//
+PR_STATIC_CALLBACK(JSBool)
+GetXULDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMXULDocument *a = (nsIDOMXULDocument*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case XULDOCUMENT_POPUP:
+      {
+        nsIDOMElement* prop;
+        if (NS_OK == a->GetPopup(&prop)) {
+          // get the js object
+          nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      default:
+        return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+/***********************************************************************/
+//
+// XULDocument Properties Setter
+//
+PR_STATIC_CALLBACK(JSBool)
+SetXULDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMXULDocument *a = (nsIDOMXULDocument*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case XULDOCUMENT_POPUP:
+      {
+        nsIDOMElement* prop;
+        if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop,
+                                                kIElementIID, "Element",
+                                                cx, *vp)) {
+          return JS_FALSE;
+        }
+      
+        a->SetPopup(prop);
+        NS_IF_RELEASE(prop);
+        break;
+      }
+      default:
+        return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+
+//
+// XULDocument finalizer
+//
+PR_STATIC_CALLBACK(void)
+FinalizeXULDocument(JSContext *cx, JSObject *obj)
+{
+  nsJSUtils::nsGenericFinalize(cx, obj);
+}
+
+
+//
+// XULDocument enumerate
+//
+PR_STATIC_CALLBACK(JSBool)
+EnumerateXULDocument(JSContext *cx, JSObject *obj)
+{
+  return nsJSUtils::nsGenericEnumerate(cx, obj);
+}
+
+
+//
+// XULDocument resolve
+//
+PR_STATIC_CALLBACK(JSBool)
+ResolveXULDocument(JSContext *cx, JSObject *obj, jsval id)
+{
+  return nsJSUtils::nsGenericResolve(cx, obj, id);
+}
+
+
+//
+// Native method GetElementById
+//
+PR_STATIC_CALLBACK(JSBool)
+XULDocumentGetElementById(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMXULDocument *nativeThis = (nsIDOMXULDocument*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  nsIDOMElement* nativeRet;
+  nsAutoString b0;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 1) {
+
+    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
+
+    if (NS_OK != nativeThis->GetElementById(b0, &nativeRet)) {
+      return JS_FALSE;
+    }
+
+    nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval);
+  }
+  else {
+    JS_ReportError(cx, "Function getElementById requires 1 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method GetElementsByAttribute
+//
+PR_STATIC_CALLBACK(JSBool)
+XULDocumentGetElementsByAttribute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMXULDocument *nativeThis = (nsIDOMXULDocument*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  nsIDOMNodeList* nativeRet;
+  nsAutoString b0;
+  nsAutoString b1;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 2) {
+
+    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
+
+    nsJSUtils::nsConvertJSValToString(b1, cx, argv[1]);
+
+    if (NS_OK != nativeThis->GetElementsByAttribute(b0, b1, &nativeRet)) {
+      return JS_FALSE;
+    }
+
+    nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval);
+  }
+  else {
+    JS_ReportError(cx, "Function getElementsByAttribute requires 2 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+/***********************************************************************/
+//
+// class for XULDocument
+//
+JSClass XULDocumentClass = {
+  "XULDocument", 
+  JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  GetXULDocumentProperty,
+  SetXULDocumentProperty,
+  EnumerateXULDocument,
+  ResolveXULDocument,
+  JS_ConvertStub,
+  FinalizeXULDocument
+};
+
+
+//
+// XULDocument class properties
+//
+static JSPropertySpec XULDocumentProperties[] =
+{
+  {"popup",    XULDOCUMENT_POPUP,    JSPROP_ENUMERATE},
+  {0}
+};
+
+
+//
+// XULDocument class methods
+//
+static JSFunctionSpec XULDocumentMethods[] = 
+{
+  {"getElementById",          XULDocumentGetElementById,     1},
+  {"getElementsByAttribute",          XULDocumentGetElementsByAttribute,     2},
+  {0}
+};
+
+
+//
+// XULDocument constructor
+//
+PR_STATIC_CALLBACK(JSBool)
+XULDocument(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  return JS_FALSE;
+}
+
+
+//
+// XULDocument class initialization
+//
+extern "C" NS_DOM nsresult NS_InitXULDocumentClass(nsIScriptContext *aContext, void **aPrototype)
+{
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  JSObject *proto = nsnull;
+  JSObject *constructor = nsnull;
+  JSObject *parent_proto = nsnull;
+  JSObject *global = JS_GetGlobalObject(jscontext);
+  jsval vp;
+
+  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "XULDocument", &vp)) ||
+      !JSVAL_IS_OBJECT(vp) ||
+      ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) ||
+      (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
+      !JSVAL_IS_OBJECT(vp)) {
+
+    if (NS_OK != NS_InitDocumentClass(aContext, (void **)&parent_proto)) {
+      return NS_ERROR_FAILURE;
+    }
+    proto = JS_InitClass(jscontext,     // context
+                         global,        // global object
+                         parent_proto,  // parent proto 
+                         &XULDocumentClass,      // JSClass
+                         XULDocument,            // JSNative ctor
+                         0,             // ctor args
+                         XULDocumentProperties,  // proto props
+                         XULDocumentMethods,     // proto funcs
+                         nsnull,        // ctor props (static)
+                         nsnull);       // ctor funcs (static)
+    if (nsnull == proto) {
+      return NS_ERROR_FAILURE;
+    }
+
+  }
+  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) {
+    proto = JSVAL_TO_OBJECT(vp);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (aPrototype) {
+    *aPrototype = proto;
+  }
+  return NS_OK;
+}
+
+
+//
+// Method for creating a new XULDocument JavaScript object
+//
+extern "C" NS_DOM nsresult NS_NewScriptXULDocument(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
+{
+  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptXULDocument");
+  JSObject *proto;
+  JSObject *parent;
+  nsIScriptObjectOwner *owner;
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  nsresult result = NS_OK;
+  nsIDOMXULDocument *aXULDocument;
+
+  if (nsnull == aParent) {
+    parent = nsnull;
+  }
+  else if (NS_OK == aParent->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
+    if (NS_OK != owner->GetScriptObject(aContext, (void **)&parent)) {
+      NS_RELEASE(owner);
+      return NS_ERROR_FAILURE;
+    }
+    NS_RELEASE(owner);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (NS_OK != NS_InitXULDocumentClass(aContext, (void **)&proto)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  result = aSupports->QueryInterface(kIXULDocumentIID, (void **)&aXULDocument);
+  if (NS_OK != result) {
+    return result;
+  }
+
+  // create a js object for this class
+  *aReturn = JS_NewObject(jscontext, &XULDocumentClass, proto, parent);
+  if (nsnull != *aReturn) {
+    // connect the native object to the js object
+    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aXULDocument);
+  }
+  else {
+    NS_RELEASE(aXULDocument);
+    return NS_ERROR_FAILURE; 
+  }
+
+  return NS_OK;
+}

mozilla/dom/src/xul/nsJSXULElement.cpp

@@ -0,0 +1,465 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#include "jsapi.h"
+#include "nsJSUtils.h"
+#include "nscore.h"
+#include "nsIScriptContext.h"
+#include "nsIJSScriptObject.h"
+#include "nsIScriptObjectOwner.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIPtr.h"
+#include "nsString.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMXULElement.h"
+#include "nsIRDFResource.h"
+#include "nsIDOMNodeList.h"
+
+
+static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
+static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
+static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
+static NS_DEFINE_IID(kIElementIID, NS_IDOMELEMENT_IID);
+static NS_DEFINE_IID(kIXULElementIID, NS_IDOMXULELEMENT_IID);
+static NS_DEFINE_IID(kIRDFResourceIID, NS_IRDFRESOURCE_IID);
+static NS_DEFINE_IID(kINodeListIID, NS_IDOMNODELIST_IID);
+
+NS_DEF_PTR(nsIDOMElement);
+NS_DEF_PTR(nsIDOMXULElement);
+NS_DEF_PTR(nsIRDFResource);
+NS_DEF_PTR(nsIDOMNodeList);
+
+//
+// XULElement property ids
+//
+enum XULElement_slots {
+  XULELEMENT_RESOURCE = -1
+};
+
+/***********************************************************************/
+//
+// XULElement Properties Getter
+//
+PR_STATIC_CALLBACK(JSBool)
+GetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMXULElement *a = (nsIDOMXULElement*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case XULELEMENT_RESOURCE:
+      {
+        nsIRDFResource* prop;
+        if (NS_OK == a->GetResource(&prop)) {
+          // get the js object; n.b., this will do a release on 'prop'
+          nsJSUtils::nsConvertXPCObjectToJSVal(prop, nsIRDFResource::GetIID(), cx, vp);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      default:
+        return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+/***********************************************************************/
+//
+// XULElement Properties Setter
+//
+PR_STATIC_CALLBACK(JSBool)
+SetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMXULElement *a = (nsIDOMXULElement*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case 0:
+      default:
+        return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+
+//
+// XULElement finalizer
+//
+PR_STATIC_CALLBACK(void)
+FinalizeXULElement(JSContext *cx, JSObject *obj)
+{
+  nsJSUtils::nsGenericFinalize(cx, obj);
+}
+
+
+//
+// XULElement enumerate
+//
+PR_STATIC_CALLBACK(JSBool)
+EnumerateXULElement(JSContext *cx, JSObject *obj)
+{
+  return nsJSUtils::nsGenericEnumerate(cx, obj);
+}
+
+
+//
+// XULElement resolve
+//
+PR_STATIC_CALLBACK(JSBool)
+ResolveXULElement(JSContext *cx, JSObject *obj, jsval id)
+{
+  return nsJSUtils::nsGenericResolve(cx, obj, id);
+}
+
+
+//
+// Native method AddBroadcastListener
+//
+PR_STATIC_CALLBACK(JSBool)
+XULElementAddBroadcastListener(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMXULElement *nativeThis = (nsIDOMXULElement*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  nsAutoString b0;
+  nsIDOMElementPtr b1;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 2) {
+
+    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b1,
+                                           kIElementIID,
+                                           "Element",
+                                           cx,
+                                           argv[1])) {
+      return JS_FALSE;
+    }
+
+    if (NS_OK != nativeThis->AddBroadcastListener(b0, b1)) {
+      return JS_FALSE;
+    }
+
+    *rval = JSVAL_VOID;
+  }
+  else {
+    JS_ReportError(cx, "Function addBroadcastListener requires 2 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method RemoveBroadcastListener
+//
+PR_STATIC_CALLBACK(JSBool)
+XULElementRemoveBroadcastListener(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMXULElement *nativeThis = (nsIDOMXULElement*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  nsAutoString b0;
+  nsIDOMElementPtr b1;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 2) {
+
+    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b1,
+                                           kIElementIID,
+                                           "Element",
+                                           cx,
+                                           argv[1])) {
+      return JS_FALSE;
+    }
+
+    if (NS_OK != nativeThis->RemoveBroadcastListener(b0, b1)) {
+      return JS_FALSE;
+    }
+
+    *rval = JSVAL_VOID;
+  }
+  else {
+    JS_ReportError(cx, "Function removeBroadcastListener requires 2 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method DoCommand
+//
+PR_STATIC_CALLBACK(JSBool)
+XULElementDoCommand(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMXULElement *nativeThis = (nsIDOMXULElement*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 0) {
+
+    if (NS_OK != nativeThis->DoCommand()) {
+      return JS_FALSE;
+    }
+
+    *rval = JSVAL_VOID;
+  }
+  else {
+    JS_ReportError(cx, "Function doCommand requires 0 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method GetElementsByAttribute
+//
+PR_STATIC_CALLBACK(JSBool)
+XULElementGetElementsByAttribute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMXULElement *nativeThis = (nsIDOMXULElement*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  nsIDOMNodeList* nativeRet;
+  nsAutoString b0;
+  nsAutoString b1;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 2) {
+
+    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
+
+    nsJSUtils::nsConvertJSValToString(b1, cx, argv[1]);
+
+    if (NS_OK != nativeThis->GetElementsByAttribute(b0, b1, &nativeRet)) {
+      return JS_FALSE;
+    }
+
+    nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval);
+  }
+  else {
+    JS_ReportError(cx, "Function getElementsByAttribute requires 2 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+/***********************************************************************/
+//
+// class for XULElement
+//
+JSClass XULElementClass = {
+  "XULElement", 
+  JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  GetXULElementProperty,
+  SetXULElementProperty,
+  EnumerateXULElement,
+  ResolveXULElement,
+  JS_ConvertStub,
+  FinalizeXULElement
+};
+
+
+//
+// XULElement class properties
+//
+static JSPropertySpec XULElementProperties[] =
+{
+  {"resource",    XULELEMENT_RESOURCE,    JSPROP_ENUMERATE | JSPROP_READONLY},
+  {0}
+};
+
+
+//
+// XULElement class methods
+//
+static JSFunctionSpec XULElementMethods[] = 
+{
+  {"addBroadcastListener",          XULElementAddBroadcastListener,     2},
+  {"removeBroadcastListener",          XULElementRemoveBroadcastListener,     2},
+  {"doCommand",          XULElementDoCommand,     0},
+  {"getElementsByAttribute",          XULElementGetElementsByAttribute,     2},
+  {0}
+};
+
+
+//
+// XULElement constructor
+//
+PR_STATIC_CALLBACK(JSBool)
+XULElement(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  return JS_FALSE;
+}
+
+
+//
+// XULElement class initialization
+//
+extern "C" NS_DOM nsresult NS_InitXULElementClass(nsIScriptContext *aContext, void **aPrototype)
+{
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  JSObject *proto = nsnull;
+  JSObject *constructor = nsnull;
+  JSObject *parent_proto = nsnull;
+  JSObject *global = JS_GetGlobalObject(jscontext);
+  jsval vp;
+
+  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "XULElement", &vp)) ||
+      !JSVAL_IS_OBJECT(vp) ||
+      ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) ||
+      (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
+      !JSVAL_IS_OBJECT(vp)) {
+
+    if (NS_OK != NS_InitElementClass(aContext, (void **)&parent_proto)) {
+      return NS_ERROR_FAILURE;
+    }
+    proto = JS_InitClass(jscontext,     // context
+                         global,        // global object
+                         parent_proto,  // parent proto 
+                         &XULElementClass,      // JSClass
+                         XULElement,            // JSNative ctor
+                         0,             // ctor args
+                         XULElementProperties,  // proto props
+                         XULElementMethods,     // proto funcs
+                         nsnull,        // ctor props (static)
+                         nsnull);       // ctor funcs (static)
+    if (nsnull == proto) {
+      return NS_ERROR_FAILURE;
+    }
+
+  }
+  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) {
+    proto = JSVAL_TO_OBJECT(vp);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (aPrototype) {
+    *aPrototype = proto;
+  }
+  return NS_OK;
+}
+
+
+//
+// Method for creating a new XULElement JavaScript object
+//
+extern "C" NS_DOM nsresult NS_NewScriptXULElement(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
+{
+  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptXULElement");
+  JSObject *proto;
+  JSObject *parent;
+  nsIScriptObjectOwner *owner;
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  nsresult result = NS_OK;
+  nsIDOMXULElement *aXULElement;
+
+  if (nsnull == aParent) {
+    parent = nsnull;
+  }
+  else if (NS_OK == aParent->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
+    if (NS_OK != owner->GetScriptObject(aContext, (void **)&parent)) {
+      NS_RELEASE(owner);
+      return NS_ERROR_FAILURE;
+    }
+    NS_RELEASE(owner);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (NS_OK != NS_InitXULElementClass(aContext, (void **)&proto)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  result = aSupports->QueryInterface(kIXULElementIID, (void **)&aXULElement);
+  if (NS_OK != result) {
+    return result;
+  }
+
+  // create a js object for this class
+  *aReturn = JS_NewObject(jscontext, &XULElementClass, proto, parent);
+  if (nsnull != *aReturn) {
+    // connect the native object to the js object
+    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aXULElement);
+  }
+  else {
+    NS_RELEASE(aXULElement);
+    return NS_ERROR_FAILURE; 
+  }
+
+  return NS_OK;
+}

mozilla/dom/src/xul/nsJSXULTreeElement.cpp

@@ -0,0 +1,303 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#include "jsapi.h"
+#include "nsJSUtils.h"
+#include "nscore.h"
+#include "nsIScriptContext.h"
+#include "nsIJSScriptObject.h"
+#include "nsIScriptObjectOwner.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIPtr.h"
+#include "nsString.h"
+#include "nsIRDFCompositeDataSource.h"
+#include "nsIDOMXULTreeElement.h"
+
+
+static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
+static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
+static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
+static NS_DEFINE_IID(kIRDFCompositeDataSourceIID, NS_IRDFCOMPOSITEDATASOURCE_IID);
+static NS_DEFINE_IID(kIXULTreeElementIID, NS_IDOMXULTREEELEMENT_IID);
+
+NS_DEF_PTR(nsIRDFCompositeDataSource);
+NS_DEF_PTR(nsIDOMXULTreeElement);
+
+//
+// XULTreeElement property ids
+//
+enum XULTreeElement_slots {
+  XULTREEELEMENT_DATABASE = -1
+};
+
+/***********************************************************************/
+//
+// XULTreeElement Properties Getter
+//
+PR_STATIC_CALLBACK(JSBool)
+GetXULTreeElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMXULTreeElement *a = (nsIDOMXULTreeElement*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case XULTREEELEMENT_DATABASE:
+      {
+        nsIRDFCompositeDataSource* prop;
+        if (NS_OK == a->GetDatabase(&prop)) {
+          // get the js object; n.b., this will do a release on 'prop'
+          nsJSUtils::nsConvertXPCObjectToJSVal(prop, nsIRDFCompositeDataSource::GetIID(), cx, vp);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      default:
+        return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+/***********************************************************************/
+//
+// XULTreeElement Properties Setter
+//
+PR_STATIC_CALLBACK(JSBool)
+SetXULTreeElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMXULTreeElement *a = (nsIDOMXULTreeElement*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case XULTREEELEMENT_DATABASE:
+      {
+        nsIRDFCompositeDataSource* prop;
+        if (PR_FALSE == nsJSUtils::nsConvertJSValToXPCObject((nsISupports **) &prop,
+                                                kIRDFCompositeDataSourceIID, cx, *vp)) {
+          return JS_FALSE;
+        }
+      
+        a->SetDatabase(prop);
+        NS_IF_RELEASE(prop);
+        break;
+      }
+      default:
+        return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+
+//
+// XULTreeElement finalizer
+//
+PR_STATIC_CALLBACK(void)
+FinalizeXULTreeElement(JSContext *cx, JSObject *obj)
+{
+  nsJSUtils::nsGenericFinalize(cx, obj);
+}
+
+
+//
+// XULTreeElement enumerate
+//
+PR_STATIC_CALLBACK(JSBool)
+EnumerateXULTreeElement(JSContext *cx, JSObject *obj)
+{
+  return nsJSUtils::nsGenericEnumerate(cx, obj);
+}
+
+
+//
+// XULTreeElement resolve
+//
+PR_STATIC_CALLBACK(JSBool)
+ResolveXULTreeElement(JSContext *cx, JSObject *obj, jsval id)
+{
+  return nsJSUtils::nsGenericResolve(cx, obj, id);
+}
+
+
+/***********************************************************************/
+//
+// class for XULTreeElement
+//
+JSClass XULTreeElementClass = {
+  "XULTreeElement", 
+  JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  GetXULTreeElementProperty,
+  SetXULTreeElementProperty,
+  EnumerateXULTreeElement,
+  ResolveXULTreeElement,
+  JS_ConvertStub,
+  FinalizeXULTreeElement
+};
+
+
+//
+// XULTreeElement class properties
+//
+static JSPropertySpec XULTreeElementProperties[] =
+{
+  {"database",    XULTREEELEMENT_DATABASE,    JSPROP_ENUMERATE},
+  {0}
+};
+
+
+//
+// XULTreeElement class methods
+//
+static JSFunctionSpec XULTreeElementMethods[] = 
+{
+  {0}
+};
+
+
+//
+// XULTreeElement constructor
+//
+PR_STATIC_CALLBACK(JSBool)
+XULTreeElement(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  return JS_FALSE;
+}
+
+
+//
+// XULTreeElement class initialization
+//
+extern "C" NS_DOM nsresult NS_InitXULTreeElementClass(nsIScriptContext *aContext, void **aPrototype)
+{
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  JSObject *proto = nsnull;
+  JSObject *constructor = nsnull;
+  JSObject *parent_proto = nsnull;
+  JSObject *global = JS_GetGlobalObject(jscontext);
+  jsval vp;
+
+  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "XULTreeElement", &vp)) ||
+      !JSVAL_IS_OBJECT(vp) ||
+      ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) ||
+      (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
+      !JSVAL_IS_OBJECT(vp)) {
+
+    if (NS_OK != NS_InitXULElementClass(aContext, (void **)&parent_proto)) {
+      return NS_ERROR_FAILURE;
+    }
+    proto = JS_InitClass(jscontext,     // context
+                         global,        // global object
+                         parent_proto,  // parent proto 
+                         &XULTreeElementClass,      // JSClass
+                         XULTreeElement,            // JSNative ctor
+                         0,             // ctor args
+                         XULTreeElementProperties,  // proto props
+                         XULTreeElementMethods,     // proto funcs
+                         nsnull,        // ctor props (static)
+                         nsnull);       // ctor funcs (static)
+    if (nsnull == proto) {
+      return NS_ERROR_FAILURE;
+    }
+
+  }
+  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) {
+    proto = JSVAL_TO_OBJECT(vp);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (aPrototype) {
+    *aPrototype = proto;
+  }
+  return NS_OK;
+}
+
+
+//
+// Method for creating a new XULTreeElement JavaScript object
+//
+extern "C" NS_DOM nsresult NS_NewScriptXULTreeElement(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
+{
+  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptXULTreeElement");
+  JSObject *proto;
+  JSObject *parent;
+  nsIScriptObjectOwner *owner;
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  nsresult result = NS_OK;
+  nsIDOMXULTreeElement *aXULTreeElement;
+
+  if (nsnull == aParent) {
+    parent = nsnull;
+  }
+  else if (NS_OK == aParent->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
+    if (NS_OK != owner->GetScriptObject(aContext, (void **)&parent)) {
+      NS_RELEASE(owner);
+      return NS_ERROR_FAILURE;
+    }
+    NS_RELEASE(owner);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (NS_OK != NS_InitXULTreeElementClass(aContext, (void **)&proto)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  result = aSupports->QueryInterface(kIXULTreeElementIID, (void **)&aXULTreeElement);
+  if (NS_OK != result) {
+    return result;
+  }
+
+  // create a js object for this class
+  *aReturn = JS_NewObject(jscontext, &XULTreeElementClass, proto, parent);
+  if (nsnull != *aReturn) {
+    // connect the native object to the js object
+    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aXULTreeElement);
+  }
+  else {
+    NS_RELEASE(aXULTreeElement);
+    return NS_ERROR_FAILURE; 
+  }
+
+  return NS_OK;
+}

mozilla/rdf/content/Makefile.in

@@ -0,0 +1,29 @@
+#!gmake
+#
+# 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.
+
+DEPTH = ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = public src
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk

mozilla/rdf/content/makefile.win

@@ -0,0 +1,27 @@
+#!gmake
+#
+# 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.
+
+DEPTH=..\..
+
+MODULE = rdf
+
+DIRS=\
+	public \
+	src \
+	$(NULL)
+
+include <$(DEPTH)\config\rules.mak>

mozilla/rdf/content/public/MANIFEST

@@ -0,0 +1,13 @@
+nsIDOMElementObserver.h
+nsIDOMNodeObserver.h
+nsIDOMXULDocument.h
+nsIDOMXULElement.h
+nsIDOMXULTreeElement.h
+nsIRDFContentModelBuilder.h
+nsIRDFDocument.h
+nsIXULSortService.h
+nsIXULParentDocument.h
+nsIXULChildDocument.h
+nsIXULDocumentInfo.h
+nsIXULPopupListener.h
+nsIStreamLoadableDocument.h

mozilla/rdf/content/public/Makefile.in

@@ -0,0 +1,47 @@
+#!gmake
+#
+# 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.
+
+DEPTH=../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = rdf
+
+EXPORTS =				\
+	nsIDOMElementObserver.h		\
+	nsIDOMNodeObserver.h		\
+	nsIDOMXULDocument.h		\
+	nsIDOMXULElement.h		\
+	nsIDOMXULTreeElement.h		\
+	nsIRDFContentModelBuilder.h	\
+	nsIRDFDocument.h		\
+	nsIXULSortService.h		\
+	nsIXULParentDocument.h	\
+	nsIXULChildDocument.h	\
+	nsIXULDocumentInfo.h	\
+	nsIXULPopupListener.h \
+	nsIStreamLoadableDocument.h	\
+        $(NULL)
+
+EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk

mozilla/rdf/content/public/idl/ElementObserver.idl

@@ -0,0 +1,9 @@
+interface ElementObserver {
+/* IID: { 0x17ddd8c2, 0xc5f8, 0x11d2, \
+        { 0xa6, 0xae, 0x0, 0x10, 0x4b, 0xde, 0x60, 0x48 } } */
+
+        void onSetAttribute(in Element element, in DOMString name, in DOMString value);
+        void onRemoveAttribute(in Element element, in DOMString name);
+        void onSetAttributeNode(in Element element, in Attr newAttr);
+        void onRemoveAttributeNode(in Element element, in Attr oldAttr);
+};

mozilla/rdf/content/public/idl/NodeObserver.idl

@@ -0,0 +1,10 @@
+interface NodeObserver {
+/* IID: { 0x3e969070, 0xc301, 0x11d2, \
+        { 0xa6, 0xae, 0x0, 0x10, 0x4b, 0xde, 0x60, 0x48 } } */
+
+        void onSetNodeValue(in Node node, in DOMString value);
+        void onInsertBefore(in Node parent, in Node newChild, in Node refChild);
+        void onReplaceChild(in Node parent, in Node newChild, in Node oldChild);
+        void onRemoveChild(in Node parent, in Node oldChild);
+        void onAppendChild(in Node parent, in Node newChild);
+};

mozilla/rdf/content/public/idl/XULDocument.idl

@@ -0,0 +1,10 @@
+interface XULDocument : Document {
+
+/* IID: { 0x17ddd8c0, 0xc5f8, 0x11d2, \
+        { 0xa6, 0xae, 0x0, 0x10, 0x4b, 0xde, 0x60, 0x48 } } */
+
+	attribute Element popup;
+
+    Element getElementById(in DOMString id);
+	NodeList getElementsByAttribute(in DOMString name, in DOMString value);
+};

mozilla/rdf/content/public/idl/XULElement.idl

@@ -0,0 +1,12 @@
+interface XULElement : Element {
+
+/* IID: { 0x574ed81, 0xc088, 0x11d2, \
+  { 0x96, 0xed, 0x0, 0x10, 0x4b, 0x7b, 0x7d, 0xeb } } */
+        readonly attribute xpidl nsIRDFResource resource;
+
+        void addBroadcastListener(in DOMString attr, in Element element);
+        void removeBroadcastListener(in DOMString attr, in Element element);
+	void doCommand();
+
+	NodeList getElementsByAttribute(in DOMString name, in DOMString value);
+};

mozilla/rdf/content/public/idl/XULTreeElement.idl

@@ -0,0 +1,5 @@
+interface XULTreeElement : XULElement {
+/* IID: { 0xa6cf90ec, 0x15b3, 0x11d2, \
+    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} } */
+        attribute xpidl nsIRDFCompositeDataSource database;
+};

mozilla/rdf/content/public/idl/makefile.win

@@ -0,0 +1,56 @@
+#!nmake
+#
+# 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.
+
+DEPTH=..\..\..\..
+IGNORE_MANIFEST=1
+
+MODULE=rdf
+
+IDLSRCS =  \
+        ElementObserver.idl     \
+        NodeObserver.idl        \
+        XULDocument.idl         \
+        XULElement.idl          \
+        XULTreeElement.idl      \
+        $(NULL)
+
+XPCOM_DESTDIR=$(DEPTH)\rdf\content\public
+JSSTUB_DESTDIR=$(DEPTH)\rdf\content\src
+
+GENXDIR=genx
+GENJSDIR=genjs
+
+!include <$(DEPTH)\config\rules.mak>
+
+$(GENXDIR):
+	-mkdir $(GENXDIR)
+
+$(GENJSDIR):
+	-mkdir $(GENJSDIR)
+
+IDLC=$(DIST)\bin\idlc.exe
+GENIID=$(DIST)\bin\geniid.pl
+
+export:: $(GENXDIR) $(GENJSDIR) $(IDLSRCS)
+	@echo +++ make: generating xpcom headers
+	$(IDLC) -d $(GENXDIR) -x $(IDLSRCS)
+	@echo +++ make: generating JavaScript stubs
+	$(IDLC) -d $(GENJSDIR) -j $(IDLSRCS)
+
+install::
+	$(MAKE_INSTALL:/=\) $(GENXDIR)\nsIDOM*.h $(XPCOM_DESTDIR)
+	$(MAKE_INSTALL:/=\) $(GENJSDIR)\nsJS*.cpp $(JSSTUB_DESTDIR)

mozilla/rdf/content/public/makefile.win

@@ -0,0 +1,40 @@
+#!gmake
+#
+# 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.
+
+
+MODULE=rdf
+
+DEPTH=..\..\..
+
+EXPORTS	= \
+        nsIDOMElementObserver.h         \
+        nsIDOMNodeObserver.h            \
+        nsIDOMXULDocument.h             \
+        nsIDOMXULElement.h              \
+        nsIDOMXULTreeElement.h          \
+        nsIRDFContentModelBuilder.h     \
+        nsIRDFDocument.h                \
+        nsIXULSortService.h		\
+	nsIXULParentDocument.h		\
+	nsIXULChildDocument.h		\
+	nsIXULDocumentInfo.h		\
+	nsIXULPopupListener.h \
+	nsIStreamLoadableDocument.h  \
+	$(NULL)
+
+include <$(DEPTH)/config/rules.mak>
+

mozilla/rdf/content/public/nsIDOMElementObserver.h

@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#ifndef nsIDOMElementObserver_h__
+#define nsIDOMElementObserver_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIScriptContext.h"
+
+class nsIDOMElement;
+class nsIDOMAttr;
+
+#define NS_IDOMELEMENTOBSERVER_IID \
+ { 0x17ddd8c2, 0xc5f8, 0x11d2, \
+        { 0xa6, 0xae, 0x0, 0x10, 0x4b, 0xde, 0x60, 0x48 } } 
+
+class nsIDOMElementObserver : public nsISupports {
+public:
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMELEMENTOBSERVER_IID; return iid; }
+
+  NS_IMETHOD    OnSetAttribute(nsIDOMElement* aElement, const nsString& aName, const nsString& aValue)=0;
+
+  NS_IMETHOD    OnRemoveAttribute(nsIDOMElement* aElement, const nsString& aName)=0;
+
+  NS_IMETHOD    OnSetAttributeNode(nsIDOMElement* aElement, nsIDOMAttr* aNewAttr)=0;
+
+  NS_IMETHOD    OnRemoveAttributeNode(nsIDOMElement* aElement, nsIDOMAttr* aOldAttr)=0;
+};
+
+
+#define NS_DECL_IDOMELEMENTOBSERVER   \
+  NS_IMETHOD    OnSetAttribute(nsIDOMElement* aElement, const nsString& aName, const nsString& aValue);  \
+  NS_IMETHOD    OnRemoveAttribute(nsIDOMElement* aElement, const nsString& aName);  \
+  NS_IMETHOD    OnSetAttributeNode(nsIDOMElement* aElement, nsIDOMAttr* aNewAttr);  \
+  NS_IMETHOD    OnRemoveAttributeNode(nsIDOMElement* aElement, nsIDOMAttr* aOldAttr);  \
+
+
+
+#define NS_FORWARD_IDOMELEMENTOBSERVER(_to)  \
+  NS_IMETHOD    OnSetAttribute(nsIDOMElement* aElement, const nsString& aName, const nsString& aValue) { return _to OnSetAttribute(aElement, aName, aValue); }  \
+  NS_IMETHOD    OnRemoveAttribute(nsIDOMElement* aElement, const nsString& aName) { return _to OnRemoveAttribute(aElement, aName); }  \
+  NS_IMETHOD    OnSetAttributeNode(nsIDOMElement* aElement, nsIDOMAttr* aNewAttr) { return _to OnSetAttributeNode(aElement, aNewAttr); }  \
+  NS_IMETHOD    OnRemoveAttributeNode(nsIDOMElement* aElement, nsIDOMAttr* aOldAttr) { return _to OnRemoveAttributeNode(aElement, aOldAttr); }  \
+
+
+extern "C" NS_DOM nsresult NS_InitElementObserverClass(nsIScriptContext *aContext, void **aPrototype);
+
+extern "C" NS_DOM nsresult NS_NewScriptElementObserver(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
+
+#endif // nsIDOMElementObserver_h__

mozilla/rdf/content/public/nsIDOMNodeObserver.h

@@ -0,0 +1,70 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#ifndef nsIDOMNodeObserver_h__
+#define nsIDOMNodeObserver_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIScriptContext.h"
+
+class nsIDOMNode;
+
+#define NS_IDOMNODEOBSERVER_IID \
+ { 0x3e969070, 0xc301, 0x11d2, \
+        { 0xa6, 0xae, 0x0, 0x10, 0x4b, 0xde, 0x60, 0x48 } } 
+
+class nsIDOMNodeObserver : public nsISupports {
+public:
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMNODEOBSERVER_IID; return iid; }
+
+  NS_IMETHOD    OnSetNodeValue(nsIDOMNode* aNode, const nsString& aValue)=0;
+
+  NS_IMETHOD    OnInsertBefore(nsIDOMNode* aParent, nsIDOMNode* aNewChild, nsIDOMNode* aRefChild)=0;
+
+  NS_IMETHOD    OnReplaceChild(nsIDOMNode* aParent, nsIDOMNode* aNewChild, nsIDOMNode* aOldChild)=0;
+
+  NS_IMETHOD    OnRemoveChild(nsIDOMNode* aParent, nsIDOMNode* aOldChild)=0;
+
+  NS_IMETHOD    OnAppendChild(nsIDOMNode* aParent, nsIDOMNode* aNewChild)=0;
+};
+
+
+#define NS_DECL_IDOMNODEOBSERVER   \
+  NS_IMETHOD    OnSetNodeValue(nsIDOMNode* aNode, const nsString& aValue);  \
+  NS_IMETHOD    OnInsertBefore(nsIDOMNode* aParent, nsIDOMNode* aNewChild, nsIDOMNode* aRefChild);  \
+  NS_IMETHOD    OnReplaceChild(nsIDOMNode* aParent, nsIDOMNode* aNewChild, nsIDOMNode* aOldChild);  \
+  NS_IMETHOD    OnRemoveChild(nsIDOMNode* aParent, nsIDOMNode* aOldChild);  \
+  NS_IMETHOD    OnAppendChild(nsIDOMNode* aParent, nsIDOMNode* aNewChild);  \
+
+
+
+#define NS_FORWARD_IDOMNODEOBSERVER(_to)  \
+  NS_IMETHOD    OnSetNodeValue(nsIDOMNode* aNode, const nsString& aValue) { return _to OnSetNodeValue(aNode, aValue); }  \
+  NS_IMETHOD    OnInsertBefore(nsIDOMNode* aParent, nsIDOMNode* aNewChild, nsIDOMNode* aRefChild) { return _to OnInsertBefore(aParent, aNewChild, aRefChild); }  \
+  NS_IMETHOD    OnReplaceChild(nsIDOMNode* aParent, nsIDOMNode* aNewChild, nsIDOMNode* aOldChild) { return _to OnReplaceChild(aParent, aNewChild, aOldChild); }  \
+  NS_IMETHOD    OnRemoveChild(nsIDOMNode* aParent, nsIDOMNode* aOldChild) { return _to OnRemoveChild(aParent, aOldChild); }  \
+  NS_IMETHOD    OnAppendChild(nsIDOMNode* aParent, nsIDOMNode* aNewChild) { return _to OnAppendChild(aParent, aNewChild); }  \
+
+
+extern "C" NS_DOM nsresult NS_InitNodeObserverClass(nsIScriptContext *aContext, void **aPrototype);
+
+extern "C" NS_DOM nsresult NS_NewScriptNodeObserver(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
+
+#endif // nsIDOMNodeObserver_h__

mozilla/rdf/content/public/nsIDOMXULDocument.h

@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#ifndef nsIDOMXULDocument_h__
+#define nsIDOMXULDocument_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIScriptContext.h"
+#include "nsIDOMDocument.h"
+
+class nsIDOMElement;
+class nsIDOMNodeList;
+
+#define NS_IDOMXULDOCUMENT_IID \
+ { 0x17ddd8c0, 0xc5f8, 0x11d2, \
+        { 0xa6, 0xae, 0x0, 0x10, 0x4b, 0xde, 0x60, 0x48 } } 
+
+class nsIDOMXULDocument : public nsIDOMDocument {
+public:
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMXULDOCUMENT_IID; return iid; }
+
+  NS_IMETHOD    GetPopup(nsIDOMElement** aPopup)=0;
+  NS_IMETHOD    SetPopup(nsIDOMElement* aPopup)=0;
+
+  NS_IMETHOD    GetElementById(const nsString& aId, nsIDOMElement** aReturn)=0;
+
+  NS_IMETHOD    GetElementsByAttribute(const nsString& aName, const nsString& aValue, nsIDOMNodeList** aReturn)=0;
+};
+
+
+#define NS_DECL_IDOMXULDOCUMENT   \
+  NS_IMETHOD    GetPopup(nsIDOMElement** aPopup);  \
+  NS_IMETHOD    SetPopup(nsIDOMElement* aPopup);  \
+  NS_IMETHOD    GetElementById(const nsString& aId, nsIDOMElement** aReturn);  \
+  NS_IMETHOD    GetElementsByAttribute(const nsString& aName, const nsString& aValue, nsIDOMNodeList** aReturn);  \
+
+
+
+#define NS_FORWARD_IDOMXULDOCUMENT(_to)  \
+  NS_IMETHOD    GetPopup(nsIDOMElement** aPopup) { return _to GetPopup(aPopup); } \
+  NS_IMETHOD    SetPopup(nsIDOMElement* aPopup) { return _to SetPopup(aPopup); } \
+  NS_IMETHOD    GetElementById(const nsString& aId, nsIDOMElement** aReturn) { return _to GetElementById(aId, aReturn); }  \
+  NS_IMETHOD    GetElementsByAttribute(const nsString& aName, const nsString& aValue, nsIDOMNodeList** aReturn) { return _to GetElementsByAttribute(aName, aValue, aReturn); }  \
+
+
+extern "C" NS_DOM nsresult NS_InitXULDocumentClass(nsIScriptContext *aContext, void **aPrototype);
+
+extern "C" NS_DOM nsresult NS_NewScriptXULDocument(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
+
+#endif // nsIDOMXULDocument_h__

mozilla/rdf/content/public/nsIDOMXULElement.h

@@ -0,0 +1,73 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#ifndef nsIDOMXULElement_h__
+#define nsIDOMXULElement_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIScriptContext.h"
+#include "nsIDOMElement.h"
+
+class nsIDOMElement;
+class nsIRDFResource;
+class nsIDOMNodeList;
+
+#define NS_IDOMXULELEMENT_IID \
+ { 0x574ed81, 0xc088, 0x11d2, \
+  { 0x96, 0xed, 0x0, 0x10, 0x4b, 0x7b, 0x7d, 0xeb } } 
+
+class nsIDOMXULElement : public nsIDOMElement {
+public:
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMXULELEMENT_IID; return iid; }
+
+  NS_IMETHOD    GetResource(nsIRDFResource** aResource)=0;
+
+  NS_IMETHOD    AddBroadcastListener(const nsString& aAttr, nsIDOMElement* aElement)=0;
+
+  NS_IMETHOD    RemoveBroadcastListener(const nsString& aAttr, nsIDOMElement* aElement)=0;
+
+  NS_IMETHOD    DoCommand()=0;
+
+  NS_IMETHOD    GetElementsByAttribute(const nsString& aName, const nsString& aValue, nsIDOMNodeList** aReturn)=0;
+};
+
+
+#define NS_DECL_IDOMXULELEMENT   \
+  NS_IMETHOD    GetResource(nsIRDFResource** aResource);  \
+  NS_IMETHOD    AddBroadcastListener(const nsString& aAttr, nsIDOMElement* aElement);  \
+  NS_IMETHOD    RemoveBroadcastListener(const nsString& aAttr, nsIDOMElement* aElement);  \
+  NS_IMETHOD    DoCommand();  \
+  NS_IMETHOD    GetElementsByAttribute(const nsString& aName, const nsString& aValue, nsIDOMNodeList** aReturn);  \
+
+
+
+#define NS_FORWARD_IDOMXULELEMENT(_to)  \
+  NS_IMETHOD    GetResource(nsIRDFResource** aResource) { return _to GetResource(aResource); } \
+  NS_IMETHOD    AddBroadcastListener(const nsString& aAttr, nsIDOMElement* aElement) { return _to AddBroadcastListener(aAttr, aElement); }  \
+  NS_IMETHOD    RemoveBroadcastListener(const nsString& aAttr, nsIDOMElement* aElement) { return _to RemoveBroadcastListener(aAttr, aElement); }  \
+  NS_IMETHOD    DoCommand() { return _to DoCommand(); }  \
+  NS_IMETHOD    GetElementsByAttribute(const nsString& aName, const nsString& aValue, nsIDOMNodeList** aReturn) { return _to GetElementsByAttribute(aName, aValue, aReturn); }  \
+
+
+extern "C" NS_DOM nsresult NS_InitXULElementClass(nsIScriptContext *aContext, void **aPrototype);
+
+extern "C" NS_DOM nsresult NS_NewScriptXULElement(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
+
+#endif // nsIDOMXULElement_h__

mozilla/rdf/content/public/nsIDOMXULTreeElement.h

@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#ifndef nsIDOMXULTreeElement_h__
+#define nsIDOMXULTreeElement_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIScriptContext.h"
+#include "nsIDOMXULElement.h"
+
+class nsIRDFCompositeDataSource;
+
+#define NS_IDOMXULTREEELEMENT_IID \
+ { 0xa6cf90ec, 0x15b3, 0x11d2, \
+    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} } 
+
+class nsIDOMXULTreeElement : public nsIDOMXULElement {
+public:
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMXULTREEELEMENT_IID; return iid; }
+
+  NS_IMETHOD    GetDatabase(nsIRDFCompositeDataSource** aDatabase)=0;
+  NS_IMETHOD    SetDatabase(nsIRDFCompositeDataSource* aDatabase)=0;
+};
+
+
+#define NS_DECL_IDOMXULTREEELEMENT   \
+  NS_IMETHOD    GetDatabase(nsIRDFCompositeDataSource** aDatabase);  \
+  NS_IMETHOD    SetDatabase(nsIRDFCompositeDataSource* aDatabase);  \
+
+
+
+#define NS_FORWARD_IDOMXULTREEELEMENT(_to)  \
+  NS_IMETHOD    GetDatabase(nsIRDFCompositeDataSource** aDatabase) { return _to GetDatabase(aDatabase); } \
+  NS_IMETHOD    SetDatabase(nsIRDFCompositeDataSource* aDatabase) { return _to SetDatabase(aDatabase); } \
+
+
+extern "C" NS_DOM nsresult NS_InitXULTreeElementClass(nsIScriptContext *aContext, void **aPrototype);
+
+extern "C" NS_DOM nsresult NS_NewScriptXULTreeElement(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
+
+#endif // nsIDOMXULTreeElement_h__

mozilla/rdf/content/public/nsIRDFContentModelBuilder.h

@@ -0,0 +1,87 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/*
+
+  A content model builder interface. An object that implements this
+  interface is associated with an nsIRDFDocument object to construct
+  an NGLayout content model.
+
+ */
+
+#ifndef nsIRDFContentModelBuilder_h__
+#define nsIRDFContentModelBuilder_h__
+
+#include "nsISupports.h"
+
+class nsIAtom;
+class nsIContent;
+class nsIRDFCompositeDataSource;
+class nsIRDFDocument;
+class nsIRDFNode;
+class nsIRDFResource;
+
+// {541AFCB0-A9A3-11d2-8EC5-00805F29F370}
+#define NS_IRDFCONTENTMODELBUILDER_IID \
+{ 0x541afcb0, 0xa9a3, 0x11d2, { 0x8e, 0xc5, 0x0, 0x80, 0x5f, 0x29, 0xf3, 0x70 } }
+
+class nsIRDFContentModelBuilder : public nsISupports
+{
+public:
+    static const nsIID& GetIID() { static nsIID iid = NS_IRDFCONTENTMODELBUILDER_IID; return iid; }
+
+    /**
+     * Point the content model builder to the document. The content model
+     * builder must not reference count the document.
+     */
+    NS_IMETHOD SetDocument(nsIRDFDocument* aDocument) = 0;
+
+    NS_IMETHOD SetDataBase(nsIRDFCompositeDataSource* aDataBase) = 0;
+    NS_IMETHOD GetDataBase(nsIRDFCompositeDataSource** aDataBase) = 0;
+
+    /**
+     * Set the root element from which this content model will
+     * operate.
+     */
+    NS_IMETHOD CreateRootContent(nsIRDFResource* aResource) = 0;
+    NS_IMETHOD SetRootContent(nsIContent* aElement) = 0;
+
+    /**
+     * Construct the contents for a container element.
+     */
+    NS_IMETHOD CreateContents(nsIContent* aElement) = 0;
+
+    /** 
+     * Construct an element. This is exposed as a public method,
+     * because the document implementation may need to call it to
+     * support the DOM's document.createElement() method.
+     */
+    NS_IMETHOD CreateElement(PRInt32 aNameSpaceID,
+                             nsIAtom* aTag,
+                             nsIRDFResource* aResource,
+                             nsIContent** aResult) = 0;
+};
+
+extern nsresult NS_NewRDFHTMLBuilder(nsIRDFContentModelBuilder** aResult);
+extern nsresult NS_NewRDFMenuBuilder(nsIRDFContentModelBuilder** aResult);
+extern nsresult NS_NewRDFToolbarBuilder(nsIRDFContentModelBuilder** aResult);
+extern nsresult NS_NewRDFTreeBuilder(nsIRDFContentModelBuilder** aResult);
+extern nsresult NS_NewRDFXULBuilder(nsIRDFContentModelBuilder** aResult);
+
+#endif // nsIRDFContentModelBuilder_h__

mozilla/rdf/content/public/nsIRDFDocument.h

@@ -0,0 +1,111 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/*
+
+  An RDF-specific extension to nsIXMLDocument. Includes methods for
+  setting the root resource of the document content model, a factory
+  method for constructing the children of a node, etc.
+
+  XXX This should really be called nsIXULDocument.
+
+ */
+
+#ifndef nsIRDFDocument_h___
+#define nsIRDFDocument_h___
+
+class nsIContent; // XXX nsIXMLDocument.h is bad and doesn't declare this class...
+
+#include "nsIXMLDocument.h"
+
+class nsIAtom;
+class nsIRDFCompositeDataSource;
+class nsIRDFContent;
+class nsIRDFContentModelBuilder;
+class nsISupportsArray;
+class nsIRDFResource;
+class nsIDOMHTMLFormElement;
+
+// {954F0811-81DC-11d2-B52A-000000000000}
+#define NS_IRDFDOCUMENT_IID \
+{ 0x954f0811, 0x81dc, 0x11d2, { 0xb5, 0x2a, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }
+
+/**
+ * RDF document extensions to nsIDocument
+ */
+
+class nsIRDFDataSource;
+
+class nsIRDFDocument : public nsIXMLDocument
+{
+public:
+  static const nsIID& GetIID() { static nsIID iid = NS_IRDFDOCUMENT_IID; return iid; }
+
+  /**
+   * Set the document's "root" resource.
+   */
+  NS_IMETHOD SetRootResource(nsIRDFResource* aResource) = 0;
+
+  NS_IMETHOD SplitProperty(nsIRDFResource* aResource,
+                           PRInt32* aNameSpaceID,
+                           nsIAtom** aTag) = 0;
+
+  // The resource-to-element map is a one-to-many mapping of RDF
+  // resources to content elements.
+
+  /**
+   * Add an entry to the resource-to-element map.
+   */
+  NS_IMETHOD AddElementForResource(nsIRDFResource* aResource, nsIContent* aElement) = 0;
+
+  /**
+   * Remove an entry from the resource-to-element map.
+   */
+  NS_IMETHOD RemoveElementForResource(nsIRDFResource* aResource, nsIContent* aElement) = 0;
+
+  /**
+   * Get the elements for a particular resource in the resource-to-element
+   * map. The nsISupportsArray will be truncated and filled in with
+   * nsIContent pointers.
+   */
+  NS_IMETHOD GetElementsForResource(nsIRDFResource* aResource, nsISupportsArray* aElements) = 0;
+
+  /**
+   * Create the contents for an element.
+   */
+  NS_IMETHOD CreateContents(nsIContent* aElement) = 0;
+
+  /**
+   * Add a content model builder to the document.
+   */
+  NS_IMETHOD AddContentModelBuilder(nsIRDFContentModelBuilder* aBuilder) = 0;
+
+  /**
+   * Get the RDF datasource that represents the document.
+   */
+  NS_IMETHOD GetDocumentDataSource(nsIRDFDataSource** aDatasource) = 0;
+
+  NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm) = 0;
+  NS_IMETHOD SetForm(nsIDOMHTMLFormElement* aForm) = 0;
+};
+
+// factory functions
+nsresult NS_NewXULDocument(nsIRDFDocument** result);
+
+#endif // nsIRDFDocument_h___

mozilla/rdf/content/public/nsIStreamLoadableDocument.h

@@ -0,0 +1,44 @@
+#ifndef nsIStreamLoadableDocument_h___
+#define nsIStreamLoadableDocument_h___
+
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+  // Wrapping includes can speed up compiles (see "Large Scale C++ Software Design")
+#ifndef nsISupports_h___
+	#include "nsISupports.h"
+#endif
+
+class nsIInputStream;
+class nsIContentViewerContainer;
+
+#define NS_ISTREAMLOADABLEDOCUMENT_IID \
+ { 0x7dae0360, 0xf907, 0x11d2,{0x81, 0xee, 0x00, 0x60, 0x08, 0x3a, 0x0b, 0xcf}}
+
+class nsIStreamLoadableDocument : public nsISupports
+	{
+		public:
+		  static const nsIID& GetIID() { static nsIID iid = NS_ISTREAMLOADABLEDOCUMENT_IID; return iid; }
+
+			NS_IMETHOD LoadFromStream( nsIInputStream& xulStream,
+																 nsIContentViewerContainer* aContainer,
+																 const char* aCommand ) = 0;
+	};
+
+#endif // !defined(nsIStreamLoadableDocument_h___)

mozilla/rdf/content/public/nsIXULChildDocument.h

@@ -0,0 +1,42 @@
+/* -*- 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.
+ */
+
+#ifndef nsIXULChildDocument_h__
+#define nsIXULChildDocument_h__
+
+#include "nsString.h"
+
+// {7B75C621-D641-11d2-BF86-00105A1B0627}
+#define NS_IXULCHILDDOCUMENT_IID \
+{ 0x7b75c621, 0xd641, 0x11d2, { 0xbf, 0x86, 0x0, 0x10, 0x5a, 0x1b, 0x6, 0x27 } }
+
+class nsIContentViewerContainer;
+class nsIRDFResource;
+
+class nsIXULChildDocument: public nsISupports {
+public:
+    static const nsIID& GetIID() { static nsIID iid = NS_IXULCHILDDOCUMENT_IID; return iid; }
+
+    NS_IMETHOD SetFragmentRoot(nsIRDFResource* aContent) = 0;
+    NS_IMETHOD GetFragmentRoot(nsIRDFResource** aContent) = 0;
+
+    // Used for popup child documents
+    NS_IMETHOD LayoutPopupDocument() = 0;
+};
+
+#endif // nsIXULChildDocument_h__

mozilla/rdf/content/public/nsIXULDocumentInfo.h

@@ -0,0 +1,50 @@
+/* -*- 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.
+ */
+
+/*
+
+  The sort service interface. This is a singleton object, and should be
+  obtained from the <tt>nsServiceManager</tt>.
+ */
+
+#ifndef nsIXULDocumentInfo_h__
+#define nsIXULDocumentInfo_h__
+
+#include "nsISupports.h"
+
+// {798E24A1-D7A5-11d2-BF86-00105A1B0627}
+#define NS_IXULDOCUMENTINFO_IID \
+{ 0x798e24a1, 0xd7a5, 0x11d2, { 0xbf, 0x86, 0x0, 0x10, 0x5a, 0x1b, 0x6, 0x27 } }
+
+class nsIDocument;
+class nsIRDFResource;
+
+class nsIXULDocumentInfo : public nsISupports {
+public:
+    static const nsIID& GetIID() { static nsIID iid = NS_IXULDOCUMENTINFO_IID; return iid; }
+
+    NS_IMETHOD Init(nsIDocument* aParentDoc, nsIRDFResource* aFragmentRoot) = 0;
+    NS_IMETHOD GetDocument(nsIDocument** aResult) = 0;
+    NS_IMETHOD GetResource(nsIRDFResource** aResult) = 0;
+};
+
+
+extern nsresult
+NS_NewXULDocumentInfo(nsIXULDocumentInfo** result);
+
+#endif // nsIXULDocumentInfo_h__

mozilla/rdf/content/public/nsIXULParentDocument.h

@@ -0,0 +1,42 @@
+/* -*- 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.
+ */
+
+#ifndef nsIXULParentDocument_h__
+#define nsIXULParentDocument_h__
+
+#include "nsString.h"
+
+// {9878C881-D63C-11d2-BF86-00105A1B0627}
+#define NS_IXULPARENTDOCUMENT_IID \
+{ 0x9878c881, 0xd63c, 0x11d2, { 0xbf, 0x86, 0x0, 0x10, 0x5a, 0x1b, 0x6, 0x27 } }
+
+class nsIContentViewerContainer;
+
+class nsIXULParentDocument: public nsISupports {
+public:
+    static const nsIID& GetIID() { static nsIID iid = NS_IXULPARENTDOCUMENT_IID; return iid; }
+
+    // Used for XUL fragment child documents
+    NS_IMETHOD GetContentViewerContainer(nsIContentViewerContainer** aContainer) = 0;
+    NS_IMETHOD GetCommand(nsString& aCommand) = 0;
+
+    // Used for XUL popup child documents
+    NS_IMETHOD CreatePopupDocument(nsIContent* aPopupElement, nsIDocument** aResult) = 0;
+};
+
+#endif // nsIXULParentDocument_h__

mozilla/rdf/content/public/nsIXULPopupListener.h

@@ -0,0 +1,45 @@
+/* -*- 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.
+ */
+
+#ifndef nsIXULPopupListener_h__
+#define nsIXULPopupListener_h__
+
+// {2C453161-0942-11d3-BF87-00105A1B0627}
+#define NS_IXULPOPUPLISTENER_IID \
+{ 0x2c453161, 0x942, 0x11d3, { 0xbf, 0x87, 0x0, 0x10, 0x5a, 0x1b, 0x6, 0x27 } }
+
+class nsIDOMElement;
+
+typedef enum {
+    eXULPopupType_popup,
+    eXULPopupType_context,
+    eXULPopupType_tooltip,
+    eXULPopupType_blur
+} XULPopupType;
+
+class nsIXULPopupListener: public nsISupports {
+public:
+    static const nsIID& GetIID() { static nsIID iid = NS_IXULPOPUPLISTENER_IID; return iid; }
+
+    NS_IMETHOD Init(nsIDOMElement* anElement, const XULPopupType& aPopupType) = 0;
+};
+
+extern nsresult
+NS_NewXULPopupListener(nsIXULPopupListener** result);
+
+#endif // nsIXULPopupListener_h__

mozilla/rdf/content/public/nsIXULSortService.h

@@ -0,0 +1,57 @@
+/* -*- 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.
+ */
+
+/*
+
+  The sort service interface. This is a singleton object, and should be
+  obtained from the <tt>nsServiceManager</tt>.
+ */
+
+#ifndef nsIXULSortService_h__
+#define nsIXULSortService_h__
+
+#include "nscore.h"
+#include "nsISupports.h"
+#include "nsIDOMNode.h"
+#include "nsString.h"
+
+
+// {BFD05261-834C-11d2-8EAC-00805F29F371}
+#define NS_IXULSORTSERVICE_IID \
+{ 0xbfd05261, 0x834c, 0x11d2, { 0x8e, 0xac, 0x0, 0x80, 0x5f, 0x29, 0xf3, 0x71 } }
+
+class nsIRDFCompositeDataSource;
+class nsIContent;
+class nsIRDFResource;
+class nsIDOMNode;
+
+class nsIXULSortService : public nsISupports {
+public:
+    static const nsIID& GetIID() { static nsIID iid = NS_IXULSORTSERVICE_IID; return iid; }
+
+    NS_IMETHOD DoSort(nsIDOMNode* node, const nsString& sortResource, const nsString& sortDirection) = 0;
+    NS_IMETHOD OpenContainer(nsIRDFCompositeDataSource *db, nsIContent *container,
+			nsIRDFResource **flatArray, PRInt32 numElements, PRInt32 elementSize) = 0;
+    NS_IMETHOD InsertContainerNode(nsIContent *container, nsIContent *child) = 0;
+};
+
+
+extern nsresult
+NS_NewXULSortService(nsIXULSortService** result);
+
+#endif // nsIXULSortService_h__

mozilla/rdf/content/src/Makefile.in

@@ -0,0 +1,77 @@
+#!gmake
+#
+# 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.
+
+DEPTH=../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
+
+LIBRARY_NAME = rdfcontent_s
+
+CPPSRCS =				\
+	nsJSElementObserver.cpp		\
+	nsJSNodeObserver.cpp		\
+	nsJSXULDocument.cpp		\
+	nsJSXULElement.cpp		\
+	nsJSXULTreeElement.cpp		\
+	nsRDFContentUtils.cpp           \
+	nsRDFDOMNodeList.cpp		\
+	nsRDFElement.cpp		\
+	nsRDFGenericBuilder.cpp		\
+	nsRDFHTMLBuilder.cpp		\
+	nsRDFMenuBuilder.cpp		\
+	nsRDFToolbarBuilder.cpp		\
+	nsRDFTreeBuilder.cpp		\
+	nsRDFXULBuilder.cpp		\
+	nsXULAttributes.cpp		\
+	nsXULDocument.cpp               \
+    nsXULSortService.cpp            \
+	nsXULTreeElement.cpp		\
+	nsXULDocumentInfo.cpp		\
+	nsXULPopupListener.cpp \
+	$(NULL)
+
+EXPORTS = \
+	$(NULL)
+
+EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+
+MODULE = rdf
+
+REQUIRES = dom js netlib rdf raptor xpcom locale
+
+# XXX This is a dependency on rdfutil.h: it'll go away once that becomes
+# a first-class XPCOM interface.
+INCLUDES += -I$(srcdir)/../../base/src
+
+# XXX This is a dependency on Raptor for constructing HTML
+# content. It'll go away once we move RDF content model construction
+# outside the DOM APIs.
+INCLUDES += -I$(srcdir)/../../../layout/html/base/src
+
+MKSHLIB :=
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/rdf/content/src/makefile.win

@@ -0,0 +1,76 @@
+#!gmake
+#
+# 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.
+
+DEPTH=..\..\..
+MODULE=rdf
+LIBRARY_NAME=rdfcontent_s
+
+DEFINES=-D_IMPL_NS_DOM
+
+LCFLAGS = \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
+
+CPP_OBJS=\
+	.\$(OBJDIR)\nsRDFGenericBuilder.obj       \
+	.\$(OBJDIR)\nsRDFMenuBuilder.obj          \
+	.\$(OBJDIR)\nsRDFToolbarBuilder.obj       \
+	.\$(OBJDIR)\nsXULAttributes.obj		  \
+        .\$(OBJDIR)\nsJSElementObserver.obj       \
+        .\$(OBJDIR)\nsJSNodeObserver.obj          \
+        .\$(OBJDIR)\nsJSXULDocument.obj           \
+        .\$(OBJDIR)\nsJSXULElement.obj            \
+        .\$(OBJDIR)\nsJSXULTreeElement.obj        \
+        .\$(OBJDIR)\nsRDFContentUtils.obj         \
+        .\$(OBJDIR)\nsRDFDOMNodeList.obj          \
+        .\$(OBJDIR)\nsRDFElement.obj              \
+        .\$(OBJDIR)\nsRDFHTMLBuilder.obj          \
+        .\$(OBJDIR)\nsRDFTreeBuilder.obj          \
+        .\$(OBJDIR)\nsRDFXULBuilder.obj           \
+        .\$(OBJDIR)\nsXULDocument.obj             \
+	    .\$(OBJDIR)\nsXULDocumentInfo.obj	  \
+		.\$(OBJDIR)\nsXULPopupListener.obj  \
+        .\$(OBJDIR)\nsXULSortService.obj          \
+        .\$(OBJDIR)\nsXULTreeElement.obj          \
+	$(NULL)
+
+# XXX we are including layout\html\base\src to get HTML elements
+# constructed directly from Raptor. The hope is that this'll
+# eventually be replaced by a DOM-based mechanism.
+
+LINCS=  -I$(PUBLIC)\rdf          \
+        -I$(PUBLIC)\xpcom        \
+        -I$(PUBLIC)\netlib       \
+        -I$(PUBLIC)\raptor       \
+        -I$(PUBLIC)\lwbrk        \
+        -I$(PUBLIC)\js           \
+        -I$(PUBLIC)\dom          \
+        -I$(PUBLIC)\locale       \
+        -I$(DEPTH)\rdf\base\src  \
+        -I$(DEPTH)\layout\html\base\src \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+libs:: $(LIBRARY)
+        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+
+

mozilla/rdf/content/src/nsJSElementObserver.cpp

@@ -0,0 +1,473 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#include "jsapi.h"
+#include "nsJSUtils.h"
+#include "nscore.h"
+#include "nsIScriptContext.h"
+#include "nsIJSScriptObject.h"
+#include "nsIScriptObjectOwner.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIPtr.h"
+#include "nsString.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMAttr.h"
+#include "nsIDOMElementObserver.h"
+
+
+static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
+static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
+static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
+static NS_DEFINE_IID(kIElementIID, NS_IDOMELEMENT_IID);
+static NS_DEFINE_IID(kIAttrIID, NS_IDOMATTR_IID);
+static NS_DEFINE_IID(kIElementObserverIID, NS_IDOMELEMENTOBSERVER_IID);
+
+NS_DEF_PTR(nsIDOMElement);
+NS_DEF_PTR(nsIDOMAttr);
+NS_DEF_PTR(nsIDOMElementObserver);
+
+
+/***********************************************************************/
+//
+// ElementObserver Properties Getter
+//
+PR_STATIC_CALLBACK(JSBool)
+GetElementObserverProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMElementObserver *a = (nsIDOMElementObserver*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case 0:
+      default:
+        return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+/***********************************************************************/
+//
+// ElementObserver Properties Setter
+//
+PR_STATIC_CALLBACK(JSBool)
+SetElementObserverProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMElementObserver *a = (nsIDOMElementObserver*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case 0:
+      default:
+        return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+
+//
+// ElementObserver finalizer
+//
+PR_STATIC_CALLBACK(void)
+FinalizeElementObserver(JSContext *cx, JSObject *obj)
+{
+  nsJSUtils::nsGenericFinalize(cx, obj);
+}
+
+
+//
+// ElementObserver enumerate
+//
+PR_STATIC_CALLBACK(JSBool)
+EnumerateElementObserver(JSContext *cx, JSObject *obj)
+{
+  return nsJSUtils::nsGenericEnumerate(cx, obj);
+}
+
+
+//
+// ElementObserver resolve
+//
+PR_STATIC_CALLBACK(JSBool)
+ResolveElementObserver(JSContext *cx, JSObject *obj, jsval id)
+{
+  return nsJSUtils::nsGenericResolve(cx, obj, id);
+}
+
+
+//
+// Native method OnSetAttribute
+//
+PR_STATIC_CALLBACK(JSBool)
+ElementObserverOnSetAttribute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMElementObserver *nativeThis = (nsIDOMElementObserver*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  nsIDOMElementPtr b0;
+  nsAutoString b1;
+  nsAutoString b2;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 3) {
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0,
+                                           kIElementIID,
+                                           "Element",
+                                           cx,
+                                           argv[0])) {
+      return JS_FALSE;
+    }
+
+    nsJSUtils::nsConvertJSValToString(b1, cx, argv[1]);
+
+    nsJSUtils::nsConvertJSValToString(b2, cx, argv[2]);
+
+    if (NS_OK != nativeThis->OnSetAttribute(b0, b1, b2)) {
+      return JS_FALSE;
+    }
+
+    *rval = JSVAL_VOID;
+  }
+  else {
+    JS_ReportError(cx, "Function onSetAttribute requires 3 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method OnRemoveAttribute
+//
+PR_STATIC_CALLBACK(JSBool)
+ElementObserverOnRemoveAttribute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMElementObserver *nativeThis = (nsIDOMElementObserver*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  nsIDOMElementPtr b0;
+  nsAutoString b1;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 2) {
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0,
+                                           kIElementIID,
+                                           "Element",
+                                           cx,
+                                           argv[0])) {
+      return JS_FALSE;
+    }
+
+    nsJSUtils::nsConvertJSValToString(b1, cx, argv[1]);
+
+    if (NS_OK != nativeThis->OnRemoveAttribute(b0, b1)) {
+      return JS_FALSE;
+    }
+
+    *rval = JSVAL_VOID;
+  }
+  else {
+    JS_ReportError(cx, "Function onRemoveAttribute requires 2 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method OnSetAttributeNode
+//
+PR_STATIC_CALLBACK(JSBool)
+ElementObserverOnSetAttributeNode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMElementObserver *nativeThis = (nsIDOMElementObserver*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  nsIDOMElementPtr b0;
+  nsIDOMAttrPtr b1;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 2) {
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0,
+                                           kIElementIID,
+                                           "Element",
+                                           cx,
+                                           argv[0])) {
+      return JS_FALSE;
+    }
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b1,
+                                           kIAttrIID,
+                                           "Attr",
+                                           cx,
+                                           argv[1])) {
+      return JS_FALSE;
+    }
+
+    if (NS_OK != nativeThis->OnSetAttributeNode(b0, b1)) {
+      return JS_FALSE;
+    }
+
+    *rval = JSVAL_VOID;
+  }
+  else {
+    JS_ReportError(cx, "Function onSetAttributeNode requires 2 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method OnRemoveAttributeNode
+//
+PR_STATIC_CALLBACK(JSBool)
+ElementObserverOnRemoveAttributeNode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMElementObserver *nativeThis = (nsIDOMElementObserver*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  nsIDOMElementPtr b0;
+  nsIDOMAttrPtr b1;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 2) {
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0,
+                                           kIElementIID,
+                                           "Element",
+                                           cx,
+                                           argv[0])) {
+      return JS_FALSE;
+    }
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b1,
+                                           kIAttrIID,
+                                           "Attr",
+                                           cx,
+                                           argv[1])) {
+      return JS_FALSE;
+    }
+
+    if (NS_OK != nativeThis->OnRemoveAttributeNode(b0, b1)) {
+      return JS_FALSE;
+    }
+
+    *rval = JSVAL_VOID;
+  }
+  else {
+    JS_ReportError(cx, "Function onRemoveAttributeNode requires 2 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+/***********************************************************************/
+//
+// class for ElementObserver
+//
+JSClass ElementObserverClass = {
+  "ElementObserver", 
+  JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  GetElementObserverProperty,
+  SetElementObserverProperty,
+  EnumerateElementObserver,
+  ResolveElementObserver,
+  JS_ConvertStub,
+  FinalizeElementObserver
+};
+
+
+//
+// ElementObserver class properties
+//
+static JSPropertySpec ElementObserverProperties[] =
+{
+  {0}
+};
+
+
+//
+// ElementObserver class methods
+//
+static JSFunctionSpec ElementObserverMethods[] = 
+{
+  {"onSetAttribute",          ElementObserverOnSetAttribute,     3},
+  {"onRemoveAttribute",          ElementObserverOnRemoveAttribute,     2},
+  {"onSetAttributeNode",          ElementObserverOnSetAttributeNode,     2},
+  {"onRemoveAttributeNode",          ElementObserverOnRemoveAttributeNode,     2},
+  {0}
+};
+
+
+//
+// ElementObserver constructor
+//
+PR_STATIC_CALLBACK(JSBool)
+ElementObserver(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  return JS_FALSE;
+}
+
+
+//
+// ElementObserver class initialization
+//
+extern "C" NS_DOM nsresult NS_InitElementObserverClass(nsIScriptContext *aContext, void **aPrototype)
+{
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  JSObject *proto = nsnull;
+  JSObject *constructor = nsnull;
+  JSObject *parent_proto = nsnull;
+  JSObject *global = JS_GetGlobalObject(jscontext);
+  jsval vp;
+
+  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "ElementObserver", &vp)) ||
+      !JSVAL_IS_OBJECT(vp) ||
+      ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) ||
+      (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
+      !JSVAL_IS_OBJECT(vp)) {
+
+    proto = JS_InitClass(jscontext,     // context
+                         global,        // global object
+                         parent_proto,  // parent proto 
+                         &ElementObserverClass,      // JSClass
+                         ElementObserver,            // JSNative ctor
+                         0,             // ctor args
+                         ElementObserverProperties,  // proto props
+                         ElementObserverMethods,     // proto funcs
+                         nsnull,        // ctor props (static)
+                         nsnull);       // ctor funcs (static)
+    if (nsnull == proto) {
+      return NS_ERROR_FAILURE;
+    }
+
+  }
+  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) {
+    proto = JSVAL_TO_OBJECT(vp);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (aPrototype) {
+    *aPrototype = proto;
+  }
+  return NS_OK;
+}
+
+
+//
+// Method for creating a new ElementObserver JavaScript object
+//
+extern "C" NS_DOM nsresult NS_NewScriptElementObserver(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
+{
+  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptElementObserver");
+  JSObject *proto;
+  JSObject *parent;
+  nsIScriptObjectOwner *owner;
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  nsresult result = NS_OK;
+  nsIDOMElementObserver *aElementObserver;
+
+  if (nsnull == aParent) {
+    parent = nsnull;
+  }
+  else if (NS_OK == aParent->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
+    if (NS_OK != owner->GetScriptObject(aContext, (void **)&parent)) {
+      NS_RELEASE(owner);
+      return NS_ERROR_FAILURE;
+    }
+    NS_RELEASE(owner);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (NS_OK != NS_InitElementObserverClass(aContext, (void **)&proto)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  result = aSupports->QueryInterface(kIElementObserverIID, (void **)&aElementObserver);
+  if (NS_OK != result) {
+    return result;
+  }
+
+  // create a js object for this class
+  *aReturn = JS_NewObject(jscontext, &ElementObserverClass, proto, parent);
+  if (nsnull != *aReturn) {
+    // connect the native object to the js object
+    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aElementObserver);
+  }
+  else {
+    NS_RELEASE(aElementObserver);
+    return NS_ERROR_FAILURE; 
+  }
+
+  return NS_OK;
+}

mozilla/rdf/content/src/nsJSNodeObserver.cpp

@@ -0,0 +1,543 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#include "jsapi.h"
+#include "nsJSUtils.h"
+#include "nscore.h"
+#include "nsIScriptContext.h"
+#include "nsIJSScriptObject.h"
+#include "nsIScriptObjectOwner.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIPtr.h"
+#include "nsString.h"
+#include "nsIDOMNode.h"
+#include "nsIDOMNodeObserver.h"
+
+
+static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
+static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
+static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
+static NS_DEFINE_IID(kINodeIID, NS_IDOMNODE_IID);
+static NS_DEFINE_IID(kINodeObserverIID, NS_IDOMNODEOBSERVER_IID);
+
+NS_DEF_PTR(nsIDOMNode);
+NS_DEF_PTR(nsIDOMNodeObserver);
+
+
+/***********************************************************************/
+//
+// NodeObserver Properties Getter
+//
+PR_STATIC_CALLBACK(JSBool)
+GetNodeObserverProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMNodeObserver *a = (nsIDOMNodeObserver*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case 0:
+      default:
+        return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+/***********************************************************************/
+//
+// NodeObserver Properties Setter
+//
+PR_STATIC_CALLBACK(JSBool)
+SetNodeObserverProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMNodeObserver *a = (nsIDOMNodeObserver*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case 0:
+      default:
+        return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+
+//
+// NodeObserver finalizer
+//
+PR_STATIC_CALLBACK(void)
+FinalizeNodeObserver(JSContext *cx, JSObject *obj)
+{
+  nsJSUtils::nsGenericFinalize(cx, obj);
+}
+
+
+//
+// NodeObserver enumerate
+//
+PR_STATIC_CALLBACK(JSBool)
+EnumerateNodeObserver(JSContext *cx, JSObject *obj)
+{
+  return nsJSUtils::nsGenericEnumerate(cx, obj);
+}
+
+
+//
+// NodeObserver resolve
+//
+PR_STATIC_CALLBACK(JSBool)
+ResolveNodeObserver(JSContext *cx, JSObject *obj, jsval id)
+{
+  return nsJSUtils::nsGenericResolve(cx, obj, id);
+}
+
+
+//
+// Native method OnSetNodeValue
+//
+PR_STATIC_CALLBACK(JSBool)
+NodeObserverOnSetNodeValue(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMNodeObserver *nativeThis = (nsIDOMNodeObserver*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  nsIDOMNodePtr b0;
+  nsAutoString b1;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 2) {
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0,
+                                           kINodeIID,
+                                           "Node",
+                                           cx,
+                                           argv[0])) {
+      return JS_FALSE;
+    }
+
+    nsJSUtils::nsConvertJSValToString(b1, cx, argv[1]);
+
+    if (NS_OK != nativeThis->OnSetNodeValue(b0, b1)) {
+      return JS_FALSE;
+    }
+
+    *rval = JSVAL_VOID;
+  }
+  else {
+    JS_ReportError(cx, "Function onSetNodeValue requires 2 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method OnInsertBefore
+//
+PR_STATIC_CALLBACK(JSBool)
+NodeObserverOnInsertBefore(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMNodeObserver *nativeThis = (nsIDOMNodeObserver*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  nsIDOMNodePtr b0;
+  nsIDOMNodePtr b1;
+  nsIDOMNodePtr b2;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 3) {
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0,
+                                           kINodeIID,
+                                           "Node",
+                                           cx,
+                                           argv[0])) {
+      return JS_FALSE;
+    }
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b1,
+                                           kINodeIID,
+                                           "Node",
+                                           cx,
+                                           argv[1])) {
+      return JS_FALSE;
+    }
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b2,
+                                           kINodeIID,
+                                           "Node",
+                                           cx,
+                                           argv[2])) {
+      return JS_FALSE;
+    }
+
+    if (NS_OK != nativeThis->OnInsertBefore(b0, b1, b2)) {
+      return JS_FALSE;
+    }
+
+    *rval = JSVAL_VOID;
+  }
+  else {
+    JS_ReportError(cx, "Function onInsertBefore requires 3 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method OnReplaceChild
+//
+PR_STATIC_CALLBACK(JSBool)
+NodeObserverOnReplaceChild(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMNodeObserver *nativeThis = (nsIDOMNodeObserver*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  nsIDOMNodePtr b0;
+  nsIDOMNodePtr b1;
+  nsIDOMNodePtr b2;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 3) {
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0,
+                                           kINodeIID,
+                                           "Node",
+                                           cx,
+                                           argv[0])) {
+      return JS_FALSE;
+    }
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b1,
+                                           kINodeIID,
+                                           "Node",
+                                           cx,
+                                           argv[1])) {
+      return JS_FALSE;
+    }
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b2,
+                                           kINodeIID,
+                                           "Node",
+                                           cx,
+                                           argv[2])) {
+      return JS_FALSE;
+    }
+
+    if (NS_OK != nativeThis->OnReplaceChild(b0, b1, b2)) {
+      return JS_FALSE;
+    }
+
+    *rval = JSVAL_VOID;
+  }
+  else {
+    JS_ReportError(cx, "Function onReplaceChild requires 3 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method OnRemoveChild
+//
+PR_STATIC_CALLBACK(JSBool)
+NodeObserverOnRemoveChild(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMNodeObserver *nativeThis = (nsIDOMNodeObserver*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  nsIDOMNodePtr b0;
+  nsIDOMNodePtr b1;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 2) {
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0,
+                                           kINodeIID,
+                                           "Node",
+                                           cx,
+                                           argv[0])) {
+      return JS_FALSE;
+    }
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b1,
+                                           kINodeIID,
+                                           "Node",
+                                           cx,
+                                           argv[1])) {
+      return JS_FALSE;
+    }
+
+    if (NS_OK != nativeThis->OnRemoveChild(b0, b1)) {
+      return JS_FALSE;
+    }
+
+    *rval = JSVAL_VOID;
+  }
+  else {
+    JS_ReportError(cx, "Function onRemoveChild requires 2 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method OnAppendChild
+//
+PR_STATIC_CALLBACK(JSBool)
+NodeObserverOnAppendChild(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMNodeObserver *nativeThis = (nsIDOMNodeObserver*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  nsIDOMNodePtr b0;
+  nsIDOMNodePtr b1;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 2) {
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0,
+                                           kINodeIID,
+                                           "Node",
+                                           cx,
+                                           argv[0])) {
+      return JS_FALSE;
+    }
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b1,
+                                           kINodeIID,
+                                           "Node",
+                                           cx,
+                                           argv[1])) {
+      return JS_FALSE;
+    }
+
+    if (NS_OK != nativeThis->OnAppendChild(b0, b1)) {
+      return JS_FALSE;
+    }
+
+    *rval = JSVAL_VOID;
+  }
+  else {
+    JS_ReportError(cx, "Function onAppendChild requires 2 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+/***********************************************************************/
+//
+// class for NodeObserver
+//
+JSClass NodeObserverClass = {
+  "NodeObserver", 
+  JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  GetNodeObserverProperty,
+  SetNodeObserverProperty,
+  EnumerateNodeObserver,
+  ResolveNodeObserver,
+  JS_ConvertStub,
+  FinalizeNodeObserver
+};
+
+
+//
+// NodeObserver class properties
+//
+static JSPropertySpec NodeObserverProperties[] =
+{
+  {0}
+};
+
+
+//
+// NodeObserver class methods
+//
+static JSFunctionSpec NodeObserverMethods[] = 
+{
+  {"onSetNodeValue",          NodeObserverOnSetNodeValue,     2},
+  {"onInsertBefore",          NodeObserverOnInsertBefore,     3},
+  {"onReplaceChild",          NodeObserverOnReplaceChild,     3},
+  {"onRemoveChild",          NodeObserverOnRemoveChild,     2},
+  {"onAppendChild",          NodeObserverOnAppendChild,     2},
+  {0}
+};
+
+
+//
+// NodeObserver constructor
+//
+PR_STATIC_CALLBACK(JSBool)
+NodeObserver(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  return JS_FALSE;
+}
+
+
+//
+// NodeObserver class initialization
+//
+extern "C" NS_DOM nsresult NS_InitNodeObserverClass(nsIScriptContext *aContext, void **aPrototype)
+{
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  JSObject *proto = nsnull;
+  JSObject *constructor = nsnull;
+  JSObject *parent_proto = nsnull;
+  JSObject *global = JS_GetGlobalObject(jscontext);
+  jsval vp;
+
+  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "NodeObserver", &vp)) ||
+      !JSVAL_IS_OBJECT(vp) ||
+      ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) ||
+      (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
+      !JSVAL_IS_OBJECT(vp)) {
+
+    proto = JS_InitClass(jscontext,     // context
+                         global,        // global object
+                         parent_proto,  // parent proto 
+                         &NodeObserverClass,      // JSClass
+                         NodeObserver,            // JSNative ctor
+                         0,             // ctor args
+                         NodeObserverProperties,  // proto props
+                         NodeObserverMethods,     // proto funcs
+                         nsnull,        // ctor props (static)
+                         nsnull);       // ctor funcs (static)
+    if (nsnull == proto) {
+      return NS_ERROR_FAILURE;
+    }
+
+  }
+  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) {
+    proto = JSVAL_TO_OBJECT(vp);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (aPrototype) {
+    *aPrototype = proto;
+  }
+  return NS_OK;
+}
+
+
+//
+// Method for creating a new NodeObserver JavaScript object
+//
+extern "C" NS_DOM nsresult NS_NewScriptNodeObserver(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
+{
+  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptNodeObserver");
+  JSObject *proto;
+  JSObject *parent;
+  nsIScriptObjectOwner *owner;
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  nsresult result = NS_OK;
+  nsIDOMNodeObserver *aNodeObserver;
+
+  if (nsnull == aParent) {
+    parent = nsnull;
+  }
+  else if (NS_OK == aParent->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
+    if (NS_OK != owner->GetScriptObject(aContext, (void **)&parent)) {
+      NS_RELEASE(owner);
+      return NS_ERROR_FAILURE;
+    }
+    NS_RELEASE(owner);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (NS_OK != NS_InitNodeObserverClass(aContext, (void **)&proto)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  result = aSupports->QueryInterface(kINodeObserverIID, (void **)&aNodeObserver);
+  if (NS_OK != result) {
+    return result;
+  }
+
+  // create a js object for this class
+  *aReturn = JS_NewObject(jscontext, &NodeObserverClass, proto, parent);
+  if (nsnull != *aReturn) {
+    // connect the native object to the js object
+    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aNodeObserver);
+  }
+  else {
+    NS_RELEASE(aNodeObserver);
+    return NS_ERROR_FAILURE; 
+  }
+
+  return NS_OK;
+}

mozilla/rdf/content/src/nsJSXULDocument.cpp

@@ -0,0 +1,386 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#include "jsapi.h"
+#include "nsJSUtils.h"
+#include "nscore.h"
+#include "nsIScriptContext.h"
+#include "nsIJSScriptObject.h"
+#include "nsIScriptObjectOwner.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIPtr.h"
+#include "nsString.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMXULDocument.h"
+#include "nsIDOMNodeList.h"
+
+
+static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
+static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
+static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
+static NS_DEFINE_IID(kIElementIID, NS_IDOMELEMENT_IID);
+static NS_DEFINE_IID(kIXULDocumentIID, NS_IDOMXULDOCUMENT_IID);
+static NS_DEFINE_IID(kINodeListIID, NS_IDOMNODELIST_IID);
+
+NS_DEF_PTR(nsIDOMElement);
+NS_DEF_PTR(nsIDOMXULDocument);
+NS_DEF_PTR(nsIDOMNodeList);
+
+//
+// XULDocument property ids
+//
+enum XULDocument_slots {
+  XULDOCUMENT_POPUP = -1
+};
+
+/***********************************************************************/
+//
+// XULDocument Properties Getter
+//
+PR_STATIC_CALLBACK(JSBool)
+GetXULDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMXULDocument *a = (nsIDOMXULDocument*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case XULDOCUMENT_POPUP:
+      {
+        nsIDOMElement* prop;
+        if (NS_OK == a->GetPopup(&prop)) {
+          // get the js object
+          nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      default:
+        return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+/***********************************************************************/
+//
+// XULDocument Properties Setter
+//
+PR_STATIC_CALLBACK(JSBool)
+SetXULDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMXULDocument *a = (nsIDOMXULDocument*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case XULDOCUMENT_POPUP:
+      {
+        nsIDOMElement* prop;
+        if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop,
+                                                kIElementIID, "Element",
+                                                cx, *vp)) {
+          return JS_FALSE;
+        }
+      
+        a->SetPopup(prop);
+        NS_IF_RELEASE(prop);
+        break;
+      }
+      default:
+        return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+
+//
+// XULDocument finalizer
+//
+PR_STATIC_CALLBACK(void)
+FinalizeXULDocument(JSContext *cx, JSObject *obj)
+{
+  nsJSUtils::nsGenericFinalize(cx, obj);
+}
+
+
+//
+// XULDocument enumerate
+//
+PR_STATIC_CALLBACK(JSBool)
+EnumerateXULDocument(JSContext *cx, JSObject *obj)
+{
+  return nsJSUtils::nsGenericEnumerate(cx, obj);
+}
+
+
+//
+// XULDocument resolve
+//
+PR_STATIC_CALLBACK(JSBool)
+ResolveXULDocument(JSContext *cx, JSObject *obj, jsval id)
+{
+  return nsJSUtils::nsGenericResolve(cx, obj, id);
+}
+
+
+//
+// Native method GetElementById
+//
+PR_STATIC_CALLBACK(JSBool)
+XULDocumentGetElementById(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMXULDocument *nativeThis = (nsIDOMXULDocument*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  nsIDOMElement* nativeRet;
+  nsAutoString b0;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 1) {
+
+    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
+
+    if (NS_OK != nativeThis->GetElementById(b0, &nativeRet)) {
+      return JS_FALSE;
+    }
+
+    nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval);
+  }
+  else {
+    JS_ReportError(cx, "Function getElementById requires 1 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method GetElementsByAttribute
+//
+PR_STATIC_CALLBACK(JSBool)
+XULDocumentGetElementsByAttribute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMXULDocument *nativeThis = (nsIDOMXULDocument*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  nsIDOMNodeList* nativeRet;
+  nsAutoString b0;
+  nsAutoString b1;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 2) {
+
+    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
+
+    nsJSUtils::nsConvertJSValToString(b1, cx, argv[1]);
+
+    if (NS_OK != nativeThis->GetElementsByAttribute(b0, b1, &nativeRet)) {
+      return JS_FALSE;
+    }
+
+    nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval);
+  }
+  else {
+    JS_ReportError(cx, "Function getElementsByAttribute requires 2 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+/***********************************************************************/
+//
+// class for XULDocument
+//
+JSClass XULDocumentClass = {
+  "XULDocument", 
+  JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  GetXULDocumentProperty,
+  SetXULDocumentProperty,
+  EnumerateXULDocument,
+  ResolveXULDocument,
+  JS_ConvertStub,
+  FinalizeXULDocument
+};
+
+
+//
+// XULDocument class properties
+//
+static JSPropertySpec XULDocumentProperties[] =
+{
+  {"popup",    XULDOCUMENT_POPUP,    JSPROP_ENUMERATE},
+  {0}
+};
+
+
+//
+// XULDocument class methods
+//
+static JSFunctionSpec XULDocumentMethods[] = 
+{
+  {"getElementById",          XULDocumentGetElementById,     1},
+  {"getElementsByAttribute",          XULDocumentGetElementsByAttribute,     2},
+  {0}
+};
+
+
+//
+// XULDocument constructor
+//
+PR_STATIC_CALLBACK(JSBool)
+XULDocument(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  return JS_FALSE;
+}
+
+
+//
+// XULDocument class initialization
+//
+extern "C" NS_DOM nsresult NS_InitXULDocumentClass(nsIScriptContext *aContext, void **aPrototype)
+{
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  JSObject *proto = nsnull;
+  JSObject *constructor = nsnull;
+  JSObject *parent_proto = nsnull;
+  JSObject *global = JS_GetGlobalObject(jscontext);
+  jsval vp;
+
+  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "XULDocument", &vp)) ||
+      !JSVAL_IS_OBJECT(vp) ||
+      ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) ||
+      (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
+      !JSVAL_IS_OBJECT(vp)) {
+
+    if (NS_OK != NS_InitDocumentClass(aContext, (void **)&parent_proto)) {
+      return NS_ERROR_FAILURE;
+    }
+    proto = JS_InitClass(jscontext,     // context
+                         global,        // global object
+                         parent_proto,  // parent proto 
+                         &XULDocumentClass,      // JSClass
+                         XULDocument,            // JSNative ctor
+                         0,             // ctor args
+                         XULDocumentProperties,  // proto props
+                         XULDocumentMethods,     // proto funcs
+                         nsnull,        // ctor props (static)
+                         nsnull);       // ctor funcs (static)
+    if (nsnull == proto) {
+      return NS_ERROR_FAILURE;
+    }
+
+  }
+  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) {
+    proto = JSVAL_TO_OBJECT(vp);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (aPrototype) {
+    *aPrototype = proto;
+  }
+  return NS_OK;
+}
+
+
+//
+// Method for creating a new XULDocument JavaScript object
+//
+extern "C" NS_DOM nsresult NS_NewScriptXULDocument(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
+{
+  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptXULDocument");
+  JSObject *proto;
+  JSObject *parent;
+  nsIScriptObjectOwner *owner;
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  nsresult result = NS_OK;
+  nsIDOMXULDocument *aXULDocument;
+
+  if (nsnull == aParent) {
+    parent = nsnull;
+  }
+  else if (NS_OK == aParent->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
+    if (NS_OK != owner->GetScriptObject(aContext, (void **)&parent)) {
+      NS_RELEASE(owner);
+      return NS_ERROR_FAILURE;
+    }
+    NS_RELEASE(owner);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (NS_OK != NS_InitXULDocumentClass(aContext, (void **)&proto)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  result = aSupports->QueryInterface(kIXULDocumentIID, (void **)&aXULDocument);
+  if (NS_OK != result) {
+    return result;
+  }
+
+  // create a js object for this class
+  *aReturn = JS_NewObject(jscontext, &XULDocumentClass, proto, parent);
+  if (nsnull != *aReturn) {
+    // connect the native object to the js object
+    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aXULDocument);
+  }
+  else {
+    NS_RELEASE(aXULDocument);
+    return NS_ERROR_FAILURE; 
+  }
+
+  return NS_OK;
+}

mozilla/rdf/content/src/nsJSXULElement.cpp

@@ -0,0 +1,465 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#include "jsapi.h"
+#include "nsJSUtils.h"
+#include "nscore.h"
+#include "nsIScriptContext.h"
+#include "nsIJSScriptObject.h"
+#include "nsIScriptObjectOwner.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIPtr.h"
+#include "nsString.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMXULElement.h"
+#include "nsIRDFResource.h"
+#include "nsIDOMNodeList.h"
+
+
+static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
+static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
+static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
+static NS_DEFINE_IID(kIElementIID, NS_IDOMELEMENT_IID);
+static NS_DEFINE_IID(kIXULElementIID, NS_IDOMXULELEMENT_IID);
+static NS_DEFINE_IID(kIRDFResourceIID, NS_IRDFRESOURCE_IID);
+static NS_DEFINE_IID(kINodeListIID, NS_IDOMNODELIST_IID);
+
+NS_DEF_PTR(nsIDOMElement);
+NS_DEF_PTR(nsIDOMXULElement);
+NS_DEF_PTR(nsIRDFResource);
+NS_DEF_PTR(nsIDOMNodeList);
+
+//
+// XULElement property ids
+//
+enum XULElement_slots {
+  XULELEMENT_RESOURCE = -1
+};
+
+/***********************************************************************/
+//
+// XULElement Properties Getter
+//
+PR_STATIC_CALLBACK(JSBool)
+GetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMXULElement *a = (nsIDOMXULElement*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case XULELEMENT_RESOURCE:
+      {
+        nsIRDFResource* prop;
+        if (NS_OK == a->GetResource(&prop)) {
+          // get the js object; n.b., this will do a release on 'prop'
+          nsJSUtils::nsConvertXPCObjectToJSVal(prop, nsIRDFResource::GetIID(), cx, vp);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      default:
+        return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+/***********************************************************************/
+//
+// XULElement Properties Setter
+//
+PR_STATIC_CALLBACK(JSBool)
+SetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMXULElement *a = (nsIDOMXULElement*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case 0:
+      default:
+        return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+
+//
+// XULElement finalizer
+//
+PR_STATIC_CALLBACK(void)
+FinalizeXULElement(JSContext *cx, JSObject *obj)
+{
+  nsJSUtils::nsGenericFinalize(cx, obj);
+}
+
+
+//
+// XULElement enumerate
+//
+PR_STATIC_CALLBACK(JSBool)
+EnumerateXULElement(JSContext *cx, JSObject *obj)
+{
+  return nsJSUtils::nsGenericEnumerate(cx, obj);
+}
+
+
+//
+// XULElement resolve
+//
+PR_STATIC_CALLBACK(JSBool)
+ResolveXULElement(JSContext *cx, JSObject *obj, jsval id)
+{
+  return nsJSUtils::nsGenericResolve(cx, obj, id);
+}
+
+
+//
+// Native method AddBroadcastListener
+//
+PR_STATIC_CALLBACK(JSBool)
+XULElementAddBroadcastListener(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMXULElement *nativeThis = (nsIDOMXULElement*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  nsAutoString b0;
+  nsIDOMElementPtr b1;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 2) {
+
+    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b1,
+                                           kIElementIID,
+                                           "Element",
+                                           cx,
+                                           argv[1])) {
+      return JS_FALSE;
+    }
+
+    if (NS_OK != nativeThis->AddBroadcastListener(b0, b1)) {
+      return JS_FALSE;
+    }
+
+    *rval = JSVAL_VOID;
+  }
+  else {
+    JS_ReportError(cx, "Function addBroadcastListener requires 2 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method RemoveBroadcastListener
+//
+PR_STATIC_CALLBACK(JSBool)
+XULElementRemoveBroadcastListener(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMXULElement *nativeThis = (nsIDOMXULElement*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  nsAutoString b0;
+  nsIDOMElementPtr b1;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 2) {
+
+    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
+
+    if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b1,
+                                           kIElementIID,
+                                           "Element",
+                                           cx,
+                                           argv[1])) {
+      return JS_FALSE;
+    }
+
+    if (NS_OK != nativeThis->RemoveBroadcastListener(b0, b1)) {
+      return JS_FALSE;
+    }
+
+    *rval = JSVAL_VOID;
+  }
+  else {
+    JS_ReportError(cx, "Function removeBroadcastListener requires 2 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method DoCommand
+//
+PR_STATIC_CALLBACK(JSBool)
+XULElementDoCommand(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMXULElement *nativeThis = (nsIDOMXULElement*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 0) {
+
+    if (NS_OK != nativeThis->DoCommand()) {
+      return JS_FALSE;
+    }
+
+    *rval = JSVAL_VOID;
+  }
+  else {
+    JS_ReportError(cx, "Function doCommand requires 0 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method GetElementsByAttribute
+//
+PR_STATIC_CALLBACK(JSBool)
+XULElementGetElementsByAttribute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMXULElement *nativeThis = (nsIDOMXULElement*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
+  nsIDOMNodeList* nativeRet;
+  nsAutoString b0;
+  nsAutoString b1;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 2) {
+
+    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
+
+    nsJSUtils::nsConvertJSValToString(b1, cx, argv[1]);
+
+    if (NS_OK != nativeThis->GetElementsByAttribute(b0, b1, &nativeRet)) {
+      return JS_FALSE;
+    }
+
+    nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval);
+  }
+  else {
+    JS_ReportError(cx, "Function getElementsByAttribute requires 2 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+/***********************************************************************/
+//
+// class for XULElement
+//
+JSClass XULElementClass = {
+  "XULElement", 
+  JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  GetXULElementProperty,
+  SetXULElementProperty,
+  EnumerateXULElement,
+  ResolveXULElement,
+  JS_ConvertStub,
+  FinalizeXULElement
+};
+
+
+//
+// XULElement class properties
+//
+static JSPropertySpec XULElementProperties[] =
+{
+  {"resource",    XULELEMENT_RESOURCE,    JSPROP_ENUMERATE | JSPROP_READONLY},
+  {0}
+};
+
+
+//
+// XULElement class methods
+//
+static JSFunctionSpec XULElementMethods[] = 
+{
+  {"addBroadcastListener",          XULElementAddBroadcastListener,     2},
+  {"removeBroadcastListener",          XULElementRemoveBroadcastListener,     2},
+  {"doCommand",          XULElementDoCommand,     0},
+  {"getElementsByAttribute",          XULElementGetElementsByAttribute,     2},
+  {0}
+};
+
+
+//
+// XULElement constructor
+//
+PR_STATIC_CALLBACK(JSBool)
+XULElement(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  return JS_FALSE;
+}
+
+
+//
+// XULElement class initialization
+//
+extern "C" NS_DOM nsresult NS_InitXULElementClass(nsIScriptContext *aContext, void **aPrototype)
+{
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  JSObject *proto = nsnull;
+  JSObject *constructor = nsnull;
+  JSObject *parent_proto = nsnull;
+  JSObject *global = JS_GetGlobalObject(jscontext);
+  jsval vp;
+
+  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "XULElement", &vp)) ||
+      !JSVAL_IS_OBJECT(vp) ||
+      ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) ||
+      (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
+      !JSVAL_IS_OBJECT(vp)) {
+
+    if (NS_OK != NS_InitElementClass(aContext, (void **)&parent_proto)) {
+      return NS_ERROR_FAILURE;
+    }
+    proto = JS_InitClass(jscontext,     // context
+                         global,        // global object
+                         parent_proto,  // parent proto 
+                         &XULElementClass,      // JSClass
+                         XULElement,            // JSNative ctor
+                         0,             // ctor args
+                         XULElementProperties,  // proto props
+                         XULElementMethods,     // proto funcs
+                         nsnull,        // ctor props (static)
+                         nsnull);       // ctor funcs (static)
+    if (nsnull == proto) {
+      return NS_ERROR_FAILURE;
+    }
+
+  }
+  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) {
+    proto = JSVAL_TO_OBJECT(vp);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (aPrototype) {
+    *aPrototype = proto;
+  }
+  return NS_OK;
+}
+
+
+//
+// Method for creating a new XULElement JavaScript object
+//
+extern "C" NS_DOM nsresult NS_NewScriptXULElement(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
+{
+  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptXULElement");
+  JSObject *proto;
+  JSObject *parent;
+  nsIScriptObjectOwner *owner;
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  nsresult result = NS_OK;
+  nsIDOMXULElement *aXULElement;
+
+  if (nsnull == aParent) {
+    parent = nsnull;
+  }
+  else if (NS_OK == aParent->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
+    if (NS_OK != owner->GetScriptObject(aContext, (void **)&parent)) {
+      NS_RELEASE(owner);
+      return NS_ERROR_FAILURE;
+    }
+    NS_RELEASE(owner);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (NS_OK != NS_InitXULElementClass(aContext, (void **)&proto)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  result = aSupports->QueryInterface(kIXULElementIID, (void **)&aXULElement);
+  if (NS_OK != result) {
+    return result;
+  }
+
+  // create a js object for this class
+  *aReturn = JS_NewObject(jscontext, &XULElementClass, proto, parent);
+  if (nsnull != *aReturn) {
+    // connect the native object to the js object
+    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aXULElement);
+  }
+  else {
+    NS_RELEASE(aXULElement);
+    return NS_ERROR_FAILURE; 
+  }
+
+  return NS_OK;
+}

mozilla/rdf/content/src/nsJSXULTreeElement.cpp

@@ -0,0 +1,303 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#include "jsapi.h"
+#include "nsJSUtils.h"
+#include "nscore.h"
+#include "nsIScriptContext.h"
+#include "nsIJSScriptObject.h"
+#include "nsIScriptObjectOwner.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIPtr.h"
+#include "nsString.h"
+#include "nsIRDFCompositeDataSource.h"
+#include "nsIDOMXULTreeElement.h"
+
+
+static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
+static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
+static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
+static NS_DEFINE_IID(kIRDFCompositeDataSourceIID, NS_IRDFCOMPOSITEDATASOURCE_IID);
+static NS_DEFINE_IID(kIXULTreeElementIID, NS_IDOMXULTREEELEMENT_IID);
+
+NS_DEF_PTR(nsIRDFCompositeDataSource);
+NS_DEF_PTR(nsIDOMXULTreeElement);
+
+//
+// XULTreeElement property ids
+//
+enum XULTreeElement_slots {
+  XULTREEELEMENT_DATABASE = -1
+};
+
+/***********************************************************************/
+//
+// XULTreeElement Properties Getter
+//
+PR_STATIC_CALLBACK(JSBool)
+GetXULTreeElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMXULTreeElement *a = (nsIDOMXULTreeElement*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case XULTREEELEMENT_DATABASE:
+      {
+        nsIRDFCompositeDataSource* prop;
+        if (NS_OK == a->GetDatabase(&prop)) {
+          // get the js object; n.b., this will do a release on 'prop'
+          nsJSUtils::nsConvertXPCObjectToJSVal(prop, nsIRDFCompositeDataSource::GetIID(), cx, vp);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      default:
+        return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+/***********************************************************************/
+//
+// XULTreeElement Properties Setter
+//
+PR_STATIC_CALLBACK(JSBool)
+SetXULTreeElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMXULTreeElement *a = (nsIDOMXULTreeElement*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case XULTREEELEMENT_DATABASE:
+      {
+        nsIRDFCompositeDataSource* prop;
+        if (PR_FALSE == nsJSUtils::nsConvertJSValToXPCObject((nsISupports **) &prop,
+                                                kIRDFCompositeDataSourceIID, cx, *vp)) {
+          return JS_FALSE;
+        }
+      
+        a->SetDatabase(prop);
+        NS_IF_RELEASE(prop);
+        break;
+      }
+      default:
+        return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+
+//
+// XULTreeElement finalizer
+//
+PR_STATIC_CALLBACK(void)
+FinalizeXULTreeElement(JSContext *cx, JSObject *obj)
+{
+  nsJSUtils::nsGenericFinalize(cx, obj);
+}
+
+
+//
+// XULTreeElement enumerate
+//
+PR_STATIC_CALLBACK(JSBool)
+EnumerateXULTreeElement(JSContext *cx, JSObject *obj)
+{
+  return nsJSUtils::nsGenericEnumerate(cx, obj);
+}
+
+
+//
+// XULTreeElement resolve
+//
+PR_STATIC_CALLBACK(JSBool)
+ResolveXULTreeElement(JSContext *cx, JSObject *obj, jsval id)
+{
+  return nsJSUtils::nsGenericResolve(cx, obj, id);
+}
+
+
+/***********************************************************************/
+//
+// class for XULTreeElement
+//
+JSClass XULTreeElementClass = {
+  "XULTreeElement", 
+  JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  GetXULTreeElementProperty,
+  SetXULTreeElementProperty,
+  EnumerateXULTreeElement,
+  ResolveXULTreeElement,
+  JS_ConvertStub,
+  FinalizeXULTreeElement
+};
+
+
+//
+// XULTreeElement class properties
+//
+static JSPropertySpec XULTreeElementProperties[] =
+{
+  {"database",    XULTREEELEMENT_DATABASE,    JSPROP_ENUMERATE},
+  {0}
+};
+
+
+//
+// XULTreeElement class methods
+//
+static JSFunctionSpec XULTreeElementMethods[] = 
+{
+  {0}
+};
+
+
+//
+// XULTreeElement constructor
+//
+PR_STATIC_CALLBACK(JSBool)
+XULTreeElement(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  return JS_FALSE;
+}
+
+
+//
+// XULTreeElement class initialization
+//
+extern "C" NS_DOM nsresult NS_InitXULTreeElementClass(nsIScriptContext *aContext, void **aPrototype)
+{
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  JSObject *proto = nsnull;
+  JSObject *constructor = nsnull;
+  JSObject *parent_proto = nsnull;
+  JSObject *global = JS_GetGlobalObject(jscontext);
+  jsval vp;
+
+  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "XULTreeElement", &vp)) ||
+      !JSVAL_IS_OBJECT(vp) ||
+      ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) ||
+      (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
+      !JSVAL_IS_OBJECT(vp)) {
+
+    if (NS_OK != NS_InitXULElementClass(aContext, (void **)&parent_proto)) {
+      return NS_ERROR_FAILURE;
+    }
+    proto = JS_InitClass(jscontext,     // context
+                         global,        // global object
+                         parent_proto,  // parent proto 
+                         &XULTreeElementClass,      // JSClass
+                         XULTreeElement,            // JSNative ctor
+                         0,             // ctor args
+                         XULTreeElementProperties,  // proto props
+                         XULTreeElementMethods,     // proto funcs
+                         nsnull,        // ctor props (static)
+                         nsnull);       // ctor funcs (static)
+    if (nsnull == proto) {
+      return NS_ERROR_FAILURE;
+    }
+
+  }
+  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) {
+    proto = JSVAL_TO_OBJECT(vp);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (aPrototype) {
+    *aPrototype = proto;
+  }
+  return NS_OK;
+}
+
+
+//
+// Method for creating a new XULTreeElement JavaScript object
+//
+extern "C" NS_DOM nsresult NS_NewScriptXULTreeElement(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
+{
+  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptXULTreeElement");
+  JSObject *proto;
+  JSObject *parent;
+  nsIScriptObjectOwner *owner;
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  nsresult result = NS_OK;
+  nsIDOMXULTreeElement *aXULTreeElement;
+
+  if (nsnull == aParent) {
+    parent = nsnull;
+  }
+  else if (NS_OK == aParent->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
+    if (NS_OK != owner->GetScriptObject(aContext, (void **)&parent)) {
+      NS_RELEASE(owner);
+      return NS_ERROR_FAILURE;
+    }
+    NS_RELEASE(owner);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (NS_OK != NS_InitXULTreeElementClass(aContext, (void **)&proto)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  result = aSupports->QueryInterface(kIXULTreeElementIID, (void **)&aXULTreeElement);
+  if (NS_OK != result) {
+    return result;
+  }
+
+  // create a js object for this class
+  *aReturn = JS_NewObject(jscontext, &XULTreeElementClass, proto, parent);
+  if (nsnull != *aReturn) {
+    // connect the native object to the js object
+    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aXULTreeElement);
+  }
+  else {
+    NS_RELEASE(aXULTreeElement);
+    return NS_ERROR_FAILURE; 
+  }
+
+  return NS_OK;
+}

mozilla/rdf/content/src/nsRDFContentUtils.cpp

@@ -0,0 +1,368 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+
+/*
+
+  A package of routines shared by the RDF content code.
+
+ */
+
+
+#include "nsCOMPtr.h"
+#include "nsIContent.h"
+#include "nsIDocument.h"
+#include "nsIRDFNode.h"
+#include "nsINameSpace.h"
+#include "nsINameSpaceManager.h"
+#include "nsIRDFService.h"
+#include "nsIServiceManager.h"
+#include "nsITextContent.h"
+#include "nsIURL.h"
+#include "nsIXMLContent.h"
+#include "nsLayoutCID.h"
+#include "nsRDFCID.h"
+#include "nsRDFContentUtils.h"
+#include "nsString.h"
+#include "nsXPIDLString.h"
+#include "prlog.h"
+#include "rdf.h"
+#include "rdfutil.h"
+
+static NS_DEFINE_IID(kIContentIID,     NS_ICONTENT_IID);
+static NS_DEFINE_IID(kIRDFResourceIID, NS_IRDFRESOURCE_IID);
+static NS_DEFINE_IID(kIRDFLiteralIID,  NS_IRDFLITERAL_IID);
+static NS_DEFINE_IID(kITextContentIID, NS_ITEXT_CONTENT_IID); // XXX grr...
+static NS_DEFINE_CID(kTextNodeCID,     NS_TEXTNODE_CID);
+static NS_DEFINE_CID(kRDFServiceCID,   NS_RDFSERVICE_CID);
+
+
+
+nsresult
+nsRDFContentUtils::AttachTextNode(nsIContent* parent, nsIRDFNode* value)
+{
+    nsresult rv;
+
+    nsAutoString s;
+    rv = GetTextForNode(value, s);
+    if (NS_FAILED(rv)) return rv;
+
+    nsCOMPtr<nsITextContent> text;
+    rv = nsComponentManager::CreateInstance(kTextNodeCID,
+                                            nsnull,
+                                            nsITextContent::GetIID(),
+                                            getter_AddRefs(text));
+    if (NS_FAILED(rv)) return rv;
+
+
+    rv = text->SetText(s.GetUnicode(), s.Length(), PR_FALSE);
+    if (NS_FAILED(rv)) return rv;
+
+    // hook it up to the child
+    rv = parent->AppendChildTo(nsCOMPtr<nsIContent>( do_QueryInterface(text) ), PR_TRUE);
+    if (NS_FAILED(rv)) return rv;
+
+    return NS_OK;
+}
+
+
+nsresult
+nsRDFContentUtils::FindChildByTag(nsIContent* aElement,
+                                  PRInt32 aNameSpaceID,
+                                  nsIAtom* aTag,
+                                  nsIContent** aResult)
+{
+    nsresult rv;
+
+    PRInt32 count;
+    if (NS_FAILED(rv = aElement->ChildCount(count)))
+        return rv;
+
+    for (PRInt32 i = 0; i < count; ++i) {
+        nsCOMPtr<nsIContent> kid;
+        if (NS_FAILED(rv = aElement->ChildAt(i, *getter_AddRefs(kid))))
+            return rv; // XXX fatal
+
+        PRInt32 nameSpaceID;
+        if (NS_FAILED(rv = kid->GetNameSpaceID(nameSpaceID)))
+            return rv; // XXX fatal
+
+        if (nameSpaceID != aNameSpaceID)
+            continue; // wrong namespace
+
+        nsCOMPtr<nsIAtom> kidTag;
+        if (NS_FAILED(rv = kid->GetTag(*getter_AddRefs(kidTag))))
+            return rv; // XXX fatal
+
+        if (kidTag.get() != aTag)
+            continue;
+
+        *aResult = kid;
+        NS_ADDREF(*aResult);
+        return NS_OK;
+    }
+
+    return NS_RDF_NO_VALUE; // not found
+}
+
+
+nsresult
+nsRDFContentUtils::FindChildByTagAndResource(nsIContent* aElement,
+                                             PRInt32 aNameSpaceID,
+                                             nsIAtom* aTag,
+                                             nsIRDFResource* aResource,
+                                             nsIContent** aResult)
+{
+    nsresult rv;
+
+    PRInt32 count;
+    if (NS_FAILED(rv = aElement->ChildCount(count)))
+        return rv;
+
+    for (PRInt32 i = 0; i < count; ++i) {
+        nsCOMPtr<nsIContent> kid;
+        if (NS_FAILED(rv = aElement->ChildAt(i, *getter_AddRefs(kid))))
+            return rv; // XXX fatal
+
+        // Make sure it's a <xul:treecell>
+        PRInt32 nameSpaceID;
+        if (NS_FAILED(rv = kid->GetNameSpaceID(nameSpaceID)))
+            return rv; // XXX fatal
+
+        if (nameSpaceID != aNameSpaceID)
+            continue; // wrong namespace
+
+        nsCOMPtr<nsIAtom> tag;
+        if (NS_FAILED(rv = kid->GetTag(*getter_AddRefs(tag))))
+            return rv; // XXX fatal
+
+        if (tag.get() != aTag)
+            continue; // wrong tag
+
+        // Now get the resource ID from the RDF:ID attribute. We do it
+        // via the content model, because you're never sure who
+        // might've added this stuff in...
+        nsCOMPtr<nsIRDFResource> resource;
+        rv = GetElementResource(kid, getter_AddRefs(resource));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "severe error retrieving resource");
+        if (NS_FAILED(rv)) return rv;
+
+        if (resource.get() != aResource)
+            continue; // not the resource we want
+
+        // Fount it!
+        *aResult = kid;
+        NS_ADDREF(*aResult);
+        return NS_OK;
+    }
+
+    return NS_RDF_NO_VALUE; // not found
+}
+
+
+nsresult
+nsRDFContentUtils::GetElementResource(nsIContent* aElement, nsIRDFResource** aResult)
+{
+    // Perform a reverse mapping from an element in the content model
+    // to an RDF resource.
+    nsresult rv;
+    nsAutoString uri;
+
+    nsCOMPtr<nsIAtom> kIdAtom( dont_QueryInterface(NS_NewAtom("id")) );
+    rv = aElement->GetAttribute(kNameSpaceID_None, kIdAtom, uri);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "severe error retrieving attribute");
+    if (NS_FAILED(rv)) return rv;
+
+    if (rv != NS_CONTENT_ATTR_HAS_VALUE)
+        return NS_ERROR_FAILURE;
+
+    // Since the element will store its ID attribute as a document-relative value,
+    // we may need to qualify it first...
+    nsCOMPtr<nsIDocument> doc;
+    rv = aElement->GetDocument(*getter_AddRefs(doc));
+    if (NS_FAILED(rv)) return rv;
+
+    NS_ASSERTION(doc != nsnull, "element is not in any document");
+    if (doc) {
+        nsIURL* docURL = nsnull;
+        doc->GetBaseURL(docURL);
+        if (docURL) {
+            const char* url;
+            docURL->GetSpec(&url);
+            rdf_PossiblyMakeAbsolute(url, uri);
+            NS_RELEASE(docURL);
+        }
+    }
+
+    NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = rdf->GetUnicodeResource(uri.GetUnicode(), aResult);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "unable to create resource");
+    if (NS_FAILED(rv)) return rv;
+
+    return NS_OK;
+}
+
+
+
+nsresult
+nsRDFContentUtils::GetTextForNode(nsIRDFNode* aNode, nsString& aResult)
+{
+    nsresult rv;
+    nsIRDFResource* resource;
+    nsIRDFLiteral* literal;
+
+    if (! aNode) {
+        aResult.Truncate();
+        rv = NS_OK;
+    }
+    else if (NS_SUCCEEDED(rv = aNode->QueryInterface(kIRDFResourceIID, (void**) &resource))) {
+        nsXPIDLCString p;
+        if (NS_SUCCEEDED(rv = resource->GetValue( getter_Copies(p) ))) {
+            aResult = p;
+        }
+        NS_RELEASE(resource);
+    }
+    else if (NS_SUCCEEDED(rv = aNode->QueryInterface(kIRDFLiteralIID, (void**) &literal))) {
+        nsXPIDLString p;
+        if (NS_SUCCEEDED(rv = literal->GetValue( getter_Copies(p) ))) {
+            aResult = p;
+        }
+        NS_RELEASE(literal);
+    }
+    else {
+        NS_ERROR("not a resource or a literal");
+        rv = NS_ERROR_UNEXPECTED;
+    }
+
+    return rv;
+}
+
+nsresult
+nsRDFContentUtils::GetElementLogString(nsIContent* aElement, nsString& aResult)
+{
+    nsresult rv;
+
+    aResult = '<';
+
+    nsCOMPtr<nsINameSpace> ns;
+
+    PRInt32 elementNameSpaceID;
+    rv = aElement->GetNameSpaceID(elementNameSpaceID);
+    if (NS_FAILED(rv)) return rv;
+
+    if (kNameSpaceID_HTML == elementNameSpaceID) {
+        aResult.Append("html:");
+    }
+    else {
+        nsCOMPtr<nsIXMLContent> xml( do_QueryInterface(aElement) );
+        NS_ASSERTION(xml != nsnull, "not an XML or HTML element");
+        if (! xml) return NS_ERROR_UNEXPECTED;
+
+        rv = xml->GetContainingNameSpace(*getter_AddRefs(ns));
+        if (NS_FAILED(rv)) return rv;
+        
+        nsCOMPtr<nsIAtom> prefix;
+        rv = ns->FindNameSpacePrefix(elementNameSpaceID, *getter_AddRefs(prefix));
+        if (NS_SUCCEEDED(rv) && (prefix != nsnull)) {
+            nsAutoString prefixStr;
+            prefix->ToString(prefixStr);
+            if (prefixStr.Length()) {
+                aResult.Append(prefix->GetUnicode());
+                aResult.Append(':');
+            }
+        }
+    }
+
+    nsCOMPtr<nsIAtom> tag;
+    rv = aElement->GetTag(*getter_AddRefs(tag));
+    if (NS_FAILED(rv)) return rv;
+
+    aResult.Append(tag->GetUnicode());
+
+    PRInt32 count;
+    rv = aElement->GetAttributeCount(count);
+    if (NS_FAILED(rv)) return rv;
+
+    for (PRInt32 i = 0; i < count; ++i) {
+        aResult.Append(' ');
+
+        PRInt32 nameSpaceID;
+        nsCOMPtr<nsIAtom> name;
+        rv = aElement->GetAttributeNameAt(i, nameSpaceID, *getter_AddRefs(name));
+        if (NS_FAILED(rv)) return rv;
+
+        nsAutoString attr;
+        nsRDFContentUtils::GetAttributeLogString(aElement, nameSpaceID, name, attr);
+
+        aResult.Append(attr);
+        aResult.Append("=\"");
+
+        nsAutoString value;
+        rv = aElement->GetAttribute(nameSpaceID, name, value);
+        if (NS_FAILED(rv)) return rv;
+
+        aResult.Append(value);
+        aResult.Append("\"");
+    }
+
+    aResult.Append('>');
+    return NS_OK;
+}
+
+
+nsresult
+nsRDFContentUtils::GetAttributeLogString(nsIContent* aElement, PRInt32 aNameSpaceID, nsIAtom* aTag, nsString& aResult)
+{
+    nsresult rv;
+
+    PRInt32 elementNameSpaceID;
+    rv = aElement->GetNameSpaceID(elementNameSpaceID);
+    if (NS_FAILED(rv)) return rv;
+
+    if ((kNameSpaceID_HTML == elementNameSpaceID) ||
+        (kNameSpaceID_None == aNameSpaceID)) {
+        aResult.Truncate();
+    }
+    else {
+        // we may have a namespace prefix on the attribute
+        nsCOMPtr<nsIXMLContent> xml( do_QueryInterface(aElement) );
+        NS_ASSERTION(xml != nsnull, "not an XML or HTML element");
+        if (! xml) return NS_ERROR_UNEXPECTED;
+
+        nsCOMPtr<nsINameSpace> ns;
+        rv = xml->GetContainingNameSpace(*getter_AddRefs(ns));
+        if (NS_FAILED(rv)) return rv;
+
+        nsCOMPtr<nsIAtom> prefix;
+        rv = ns->FindNameSpacePrefix(aNameSpaceID, *getter_AddRefs(prefix));
+        if (NS_SUCCEEDED(rv) && (prefix != nsnull)) {
+            nsAutoString prefixStr;
+            prefix->ToString(prefixStr);
+            if (prefixStr.Length()) {
+                aResult.Append(prefix->GetUnicode());
+                aResult.Append(':');
+            }
+        }
+    }
+
+    aResult.Append(aTag->GetUnicode());
+    return NS_OK;
+}

mozilla/rdf/content/src/nsRDFContentUtils.h

@@ -0,0 +1,77 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/*
+
+  A package of routines shared by the RDF content code.
+
+ */
+
+#ifndef nsRDFContentUtils_h__
+#define nsRDFContentUtils_h__
+
+#include "nsError.h"
+
+class nsIAtom;
+class nsIContent;
+class nsIDOMNodeList;
+class nsIRDFNode;
+class nsString;
+
+
+class nsRDFContentUtils
+{
+public:
+
+    static nsresult
+    AttachTextNode(nsIContent* parent, nsIRDFNode* value);
+    
+    static nsresult
+    FindChildByTag(nsIContent *aElement,
+                   PRInt32 aNameSpaceID,
+                   nsIAtom* aTag,
+                   nsIContent **aResult);
+
+    static nsresult
+    FindChildByTagAndResource(nsIContent* aElement,
+                              PRInt32 aNameSpaceID,
+                              nsIAtom* aTag,
+                              nsIRDFResource* aResource,
+                              nsIContent** aResult);
+
+    static nsresult
+    GetElementResource(nsIContent* aElement, nsIRDFResource** aResult);
+
+    static nsresult
+    GetTextForNode(nsIRDFNode* aNode, nsString& aResult);
+
+    static nsresult
+    GetElementLogString(nsIContent* aElement, nsString& aResult);
+
+    static nsresult
+    GetAttributeLogString(nsIContent* aElement, PRInt32 aNameSpaceID, nsIAtom* aTag, nsString& aResult);
+};
+
+
+// in nsRDFElement.cpp
+extern nsresult
+NS_NewRDFElement(PRInt32 aNameSpaceID, nsIAtom* aTag, nsIContent** aResult);
+
+#endif // nsRDFContentUtils_h__
+

mozilla/rdf/content/src/nsRDFDOMNodeList.cpp

@@ -0,0 +1,311 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/*
+
+    Helper class to implement the nsIDOMNodeList interface.
+
+    XXX It's probably wrong in some sense, as it uses the "naked"
+    content interface to look for kids. (I assume in general this is
+    bad because there may be pseudo-elements created for presentation
+    that aren't visible to the DOM.)
+
+*/
+
+#include "nsDOMCID.h"
+#include "nsIDOMNode.h"
+#include "nsIDOMHTMLCollection.h"
+#include "nsIDOMScriptObjectFactory.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIServiceManager.h"
+#include "nsISupportsArray.h"
+#include "nsRDFDOMNodeList.h"
+
+////////////////////////////////////////////////////////////////////////
+// GUID definitions
+
+static NS_DEFINE_IID(kIDOMNodeIID,                NS_IDOMNODE_IID);
+static NS_DEFINE_IID(kIDOMNodeListIID,            NS_IDOMNODELIST_IID);
+static NS_DEFINE_IID(kIDOMScriptObjectFactoryIID, NS_IDOM_SCRIPT_OBJECT_FACTORY_IID);
+
+static NS_DEFINE_CID(kDOMScriptObjectFactoryCID,  NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
+
+////////////////////////////////////////////////////////////////////////
+//
+
+class RDFHTMLCollectionImpl : public nsIDOMHTMLCollection
+{
+private:
+    nsRDFDOMNodeList* mOuter;
+
+public:
+    RDFHTMLCollectionImpl(nsRDFDOMNodeList* aOuter);
+    virtual ~RDFHTMLCollectionImpl();
+
+    // nsISupports interface
+    NS_IMETHOD_(nsrefcnt) AddRef(void);
+    NS_IMETHOD_(nsrefcnt) Release(void);
+    NS_IMETHOD QueryInterface(REFNSIID aIID, void** aResult);
+    
+    // nsIDOMHTMLCollection interface
+    NS_DECL_IDOMHTMLCOLLECTION
+};
+
+
+RDFHTMLCollectionImpl::RDFHTMLCollectionImpl(nsRDFDOMNodeList* aOuter)
+    : mOuter(aOuter)
+{
+}
+
+RDFHTMLCollectionImpl::~RDFHTMLCollectionImpl(void)
+{
+}
+
+NS_IMETHODIMP_(nsrefcnt)
+RDFHTMLCollectionImpl::AddRef(void)
+{
+    return mOuter->AddRef();
+}
+
+NS_IMETHODIMP_(nsrefcnt)
+RDFHTMLCollectionImpl::Release(void)
+{
+    return mOuter->Release();
+}
+
+NS_IMETHODIMP
+RDFHTMLCollectionImpl::QueryInterface(REFNSIID aIID, void** aResult)
+{
+    NS_PRECONDITION(aResult != nsnull, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    if (aIID.Equals(nsIDOMHTMLCollection::GetIID())) {
+        *aResult = NS_STATIC_CAST(nsIDOMHTMLCollection*, this);
+        NS_ADDREF(this);
+        return NS_OK;
+    }
+    else {
+        return mOuter->QueryInterface(aIID, aResult);
+    }
+}
+
+
+NS_IMETHODIMP
+RDFHTMLCollectionImpl::GetLength(PRUint32* aLength)
+{
+    return mOuter->GetLength(aLength);
+}
+
+
+NS_IMETHODIMP
+RDFHTMLCollectionImpl::Item(PRUint32 aIndex, nsIDOMNode** aReturn)
+{
+    return mOuter->Item(aIndex, aReturn);
+}
+
+
+NS_IMETHODIMP
+RDFHTMLCollectionImpl::NamedItem(const nsString& aName, nsIDOMNode** aReturn)
+{
+    NS_NOTYETIMPLEMENTED("write me!");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+
+////////////////////////////////////////////////////////////////////////
+// ctors & dtors
+
+nsRDFDOMNodeList::nsRDFDOMNodeList(void)
+    : mInner(nsnull),
+      mElements(nsnull),
+      mScriptObject(nsnull)
+{
+    NS_INIT_REFCNT();
+}
+
+nsRDFDOMNodeList::~nsRDFDOMNodeList(void)
+{
+    NS_IF_RELEASE(mElements);
+    delete mInner;
+}
+
+nsresult
+nsRDFDOMNodeList::Create(nsRDFDOMNodeList** aResult)
+{
+    NS_PRECONDITION(aResult != nsnull, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    nsRDFDOMNodeList* list = new nsRDFDOMNodeList();
+    if (! list)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    nsresult rv;
+    if (NS_FAILED(rv = list->Init())) {
+        delete list;
+        return rv;
+    }
+
+    NS_ADDREF(list);
+    *aResult = list;
+    return NS_OK;
+}
+
+
+////////////////////////////////////////////////////////////////////////
+// nsISupports interface
+
+NS_IMPL_ADDREF(nsRDFDOMNodeList);
+NS_IMPL_RELEASE(nsRDFDOMNodeList);
+
+nsresult
+nsRDFDOMNodeList::QueryInterface(REFNSIID aIID, void** aResult)
+{
+static NS_DEFINE_IID(kISupportsIID,          NS_ISUPPORTS_IID);
+static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
+
+    NS_PRECONDITION(aResult != nsnull, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    if (aIID.Equals(nsIDOMNodeList::GetIID()) ||
+        aIID.Equals(kISupportsIID)) {
+        *aResult = NS_STATIC_CAST(nsIDOMNodeList*, this);
+        NS_ADDREF(this);
+        return NS_OK;
+    }
+    else if (aIID.Equals(kIScriptObjectOwnerIID)) {
+        *aResult = NS_STATIC_CAST(nsIScriptObjectOwner*, this);
+        NS_ADDREF(this);
+        return NS_OK;
+    }
+    else if (aIID.Equals(nsIDOMHTMLCollection::GetIID())) {
+        // Aggregate this interface
+        if (! mInner) {
+            if (! (mInner = new RDFHTMLCollectionImpl(this)))
+                return NS_ERROR_OUT_OF_MEMORY;
+        }
+
+        return mInner->QueryInterface(aIID, aResult);
+    }
+    return NS_NOINTERFACE;
+}
+
+////////////////////////////////////////////////////////////////////////
+// nsIDOMNodeList interface
+
+NS_IMETHODIMP
+nsRDFDOMNodeList::GetLength(PRUint32* aLength)
+{
+    NS_ASSERTION(aLength != nsnull, "null ptr");
+    if (! aLength)
+        return NS_ERROR_NULL_POINTER;
+
+    PRUint32 cnt;
+    nsresult rv = mElements->Count(&cnt);
+    if (NS_FAILED(rv)) return rv;
+    *aLength = cnt;
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP
+nsRDFDOMNodeList::Item(PRUint32 aIndex, nsIDOMNode** aReturn)
+{
+    NS_PRECONDITION(aReturn != nsnull, "null ptr");
+    if (! aReturn)
+        return NS_ERROR_NULL_POINTER;
+
+    PRUint32 cnt;
+    nsresult rv = mElements->Count(&cnt);
+    if (NS_FAILED(rv)) return rv;
+    NS_PRECONDITION(aIndex < cnt, "invalid arg");
+    if (aIndex >= (PRUint32) cnt)
+        return NS_ERROR_INVALID_ARG;
+
+    // Cast is okay because we're in a closed system.
+    *aReturn = (nsIDOMNode*) mElements->ElementAt(aIndex);
+    return NS_OK;
+}
+
+
+////////////////////////////////////////////////////////////////////////
+// nsIScriptObjectOwner interface
+
+NS_IMETHODIMP
+nsRDFDOMNodeList::GetScriptObject(nsIScriptContext *aContext, void** aScriptObject)
+{
+    nsresult rv = NS_OK;
+    nsIScriptGlobalObject* global = aContext->GetGlobalObject();
+
+    if (nsnull == mScriptObject) {
+        nsIDOMScriptObjectFactory *factory;
+    
+        if (NS_SUCCEEDED(rv = nsServiceManager::GetService(kDOMScriptObjectFactoryCID,
+                                                           kIDOMScriptObjectFactoryIID,
+                                                           (nsISupports **)&factory))) {
+            rv = factory->NewScriptHTMLCollection(aContext, 
+                                                  (nsISupports*)(nsIDOMNodeList*)this, 
+                                                  global, 
+                                                  (void**)&mScriptObject);
+
+            nsServiceManager::ReleaseService(kDOMScriptObjectFactoryCID, factory);
+        }
+    }
+    *aScriptObject = mScriptObject;
+
+    NS_RELEASE(global);
+    return rv;
+}
+
+NS_IMETHODIMP
+nsRDFDOMNodeList::SetScriptObject(void* aScriptObject)
+{
+    mScriptObject = aScriptObject;
+    return NS_OK;
+}
+
+
+////////////////////////////////////////////////////////////////////////
+// Implementation methods
+
+nsresult
+nsRDFDOMNodeList::Init(void)
+{
+    nsresult rv;
+    if (NS_FAILED(rv = NS_NewISupportsArray(&mElements))) {
+        NS_ERROR("unable to create elements array");
+        return rv;
+    }
+
+    return NS_OK;
+}
+
+
+nsresult
+nsRDFDOMNodeList::AppendNode(nsIDOMNode* aNode)
+{
+    NS_PRECONDITION(aNode != nsnull, "null ptr");
+    if (! aNode)
+        return NS_ERROR_NULL_POINTER;
+
+    return mElements->AppendElement(aNode);
+}

mozilla/rdf/content/src/nsRDFDOMNodeList.h

@@ -0,0 +1,58 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+#ifndef nsRDFDOMNodeList_h__
+#define nsRDFDOMNodeList_h__
+
+#include "nsIDOMNodeList.h"
+#include "nsIScriptObjectOwner.h"
+class nsIDOMNode;
+class nsISupportsArray;
+
+class nsRDFDOMNodeList : public nsIDOMNodeList,
+                         public nsIScriptObjectOwner
+{
+private:
+    nsISupports* mInner;
+    nsISupportsArray* mElements;
+    void* mScriptObject;
+
+    nsRDFDOMNodeList(void);
+    nsresult Init(void);
+
+public:
+    static nsresult Create(nsRDFDOMNodeList** aResult);
+    virtual ~nsRDFDOMNodeList(void);
+
+    // nsISupports interface
+    NS_DECL_ISUPPORTS
+
+    // nsIDOMNodeList interface
+    NS_DECL_IDOMNODELIST
+
+    // nsIScriptObjectOwner interface
+    NS_IMETHOD GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
+    NS_IMETHOD SetScriptObject(void* aScriptObject);
+
+    // Implementation methods
+    nsresult AppendNode(nsIDOMNode* aNode);
+};
+
+#endif // nsRDFDOMNodeList_h__
+

mozilla/rdf/content/src/nsRDFGenericBuilder.h

@@ -0,0 +1,215 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/*
+
+  An implementation that builds a XUL
+  content model that is to be used with a certain widget.  This class
+  is abstract.
+ */
+
+#include "nsIRDFContainerUtils.h" 
+#include "nsIRDFContentModelBuilder.h"
+#include "nsIRDFObserver.h"
+#include "nsIDOMNodeObserver.h"
+#include "nsIDOMElementObserver.h"
+#include "nsITimer.h"
+#include "nsITimerCallback.h"
+#include "nsIXULSortService.h"
+
+class nsIRDFDocument;
+class nsIRDFCompositeDataSource;
+class nsIRDFResource;
+class nsIContent;
+class nsIRDFNode;
+class nsIAtom;
+class nsIRDFService;
+
+class RDFGenericBuilderImpl : public nsIRDFContentModelBuilder,
+                              public nsIRDFObserver,
+                              public nsIDOMNodeObserver,
+                              public nsIDOMElementObserver,
+                              public nsITimerCallback
+{
+public:
+    RDFGenericBuilderImpl();
+    virtual ~RDFGenericBuilderImpl();
+
+    // nsISupports interface
+    NS_DECL_ISUPPORTS
+
+    // nsIRDFContentModelBuilder interface
+    NS_IMETHOD SetDocument(nsIRDFDocument* aDocument);
+    NS_IMETHOD SetDataBase(nsIRDFCompositeDataSource* aDataBase);
+    NS_IMETHOD GetDataBase(nsIRDFCompositeDataSource** aDataBase);
+    NS_IMETHOD CreateRootContent(nsIRDFResource* aResource);
+    NS_IMETHOD SetRootContent(nsIContent* aElement);
+    NS_IMETHOD CreateContents(nsIContent* aElement);
+    NS_IMETHOD CreateElement(PRInt32 aNameSpaceID,
+                             nsIAtom* aTag,
+                             nsIRDFResource* aResource,
+                             nsIContent** aResult);
+
+    NS_IMETHOD SetAllAttributesOnElement(nsIContent *aNode, nsIRDFResource *res);
+    NS_IMETHOD FindTemplateForResource(nsIRDFResource *aNode, nsIContent **theTemplate);
+    NS_IMETHOD IsTemplateRuleMatch(nsIRDFResource *aNode, nsIContent *aRule, PRBool *matchingRuleFound);
+    NS_IMETHOD PopulateWidgetItemSubtree(nsIContent *aTemplateRoot, nsIContent *aTemplate,
+                    nsIContent *treeCell, nsIContent* aElement, nsIRDFResource* aProperty,
+                    nsIRDFResource* aValue, PRInt32 aNaturalOrderPos);
+    NS_IMETHOD CreateWidgetItem(nsIContent* aElement, nsIRDFResource* aProperty,
+				nsIRDFResource* aValue, PRInt32 aNaturalOrderPos);
+
+    // nsIRDFObserver interface
+    NS_IMETHOD OnAssert(nsIRDFResource* aSubject, nsIRDFResource* aPredicate, nsIRDFNode* aObject);
+    NS_IMETHOD OnUnassert(nsIRDFResource* aSubject, nsIRDFResource* aPredicate, nsIRDFNode* aObjetct);
+
+    // nsIDOMNodeObserver interface
+    NS_DECL_IDOMNODEOBSERVER
+
+    // nsIDOMElementObserver interface
+    NS_DECL_IDOMELEMENTOBSERVER
+
+    // Implementation methods
+    nsresult
+    EnsureElementHasGenericChild(nsIContent* aParent,
+                                 PRInt32 aNameSpaceID,
+                                 nsIAtom* aTag,
+                                 nsIContent** aResult);
+
+    nsresult
+    FindWidgetRootElement(nsIContent* aElement,
+                          nsIContent** aRootElement);
+
+    virtual nsresult
+    AddWidgetItem(nsIContent* aWidgetElement,
+                  nsIRDFResource* aProperty,
+                  nsIRDFResource* aValue, 
+                  PRInt32 naturalOrderPos) = 0;
+
+    virtual nsresult
+    RemoveWidgetItem(nsIContent* aWidgetElement,
+                     nsIRDFResource* aProperty,
+                     nsIRDFResource* aValue) = 0;
+
+    virtual nsresult
+    SetWidgetAttribute(nsIContent* aWidgetElement,
+                       nsIRDFResource* aProperty,
+                       nsIRDFNode* aValue) = 0;
+
+    virtual nsresult
+    UnsetWidgetAttribute(nsIContent* aWidgetElement,
+                         nsIRDFResource* aProperty,
+                         nsIRDFNode* aValue) = 0;
+
+    virtual PRBool
+    IsContainmentProperty(nsIContent* aElement, nsIRDFResource* aProperty);
+
+    virtual PRBool
+    IsIgnoredProperty(nsIContent* aElement, nsIRDFResource* aProperty);
+
+    PRBool
+    IsContainer(nsIContent* aParentElement, nsIRDFResource* aTargetResource);
+
+    PRBool
+    IsOpen(nsIContent* aElement);
+
+    PRBool
+    IsElementInWidget(nsIContent* aElement);
+   
+    PRBool
+    IsItemOrFolder(nsIContent* aElement);
+ 
+    PRBool
+    IsWidgetInsertionRootElement(nsIContent* aElement);
+
+    nsresult
+    GetDOMNodeResource(nsIDOMNode* aNode, nsIRDFResource** aResource);
+
+    nsresult
+    GetResource(PRInt32 aNameSpaceID,
+                nsIAtom* aNameAtom,
+                nsIRDFResource** aResource);
+
+    virtual nsresult
+    OpenWidgetItem(nsIContent* aElement);
+
+    virtual nsresult
+    CloseWidgetItem(nsIContent* aElement);
+
+    virtual nsresult
+    GetRootWidgetAtom(nsIAtom** aResult) = 0;
+
+    virtual nsresult
+    GetWidgetItemAtom(nsIAtom** aResult) = 0;
+
+    virtual nsresult
+    GetWidgetFolderAtom(nsIAtom** aResult) = 0;
+
+    virtual nsresult
+    GetInsertionRootAtom(nsIAtom** aResult) = 0;
+
+    virtual nsresult
+    GetItemAtomThatContainsTheChildren(nsIAtom** aResult) = 0;
+    // Well, you come up with a better name.
+
+protected:
+    nsIRDFDocument*            mDocument;
+    nsIRDFCompositeDataSource* mDB;
+    nsIContent*                mRoot;
+
+    nsITimer			*mTimer;
+
+    virtual void
+    Notify(nsITimer *timer) = 0;
+
+    // pseudo-constants
+    static nsrefcnt gRefCnt;
+    static nsIRDFService*        gRDFService;
+    static nsIRDFContainerUtils* gRDFContainerUtils;
+    static nsINameSpaceManager* gNameSpaceManager;
+
+    static nsIAtom* kContainerAtom;
+    static nsIAtom* kItemContentsGeneratedAtom;
+    static nsIAtom* kNaturalOrderPosAtom;
+    static nsIAtom* kIdAtom;
+    static nsIAtom* kOpenAtom;
+    static nsIAtom* kResourceAtom;
+    static nsIAtom* kContainmentAtom;
+    static nsIAtom* kIgnoreAtom;
+
+    static nsIAtom* kSubcontainmentAtom;
+    static nsIAtom* kRootcontainmentAtom;
+    static nsIAtom* kTreeTemplateAtom;
+    static nsIAtom* kRuleAtom;
+    static nsIAtom* kTreeContentsGeneratedAtom;
+    static nsIAtom* kTextAtom;
+    static nsIAtom* kPropertyAtom;
+    static nsIAtom* kInstanceOfAtom;
+
+    static PRInt32  kNameSpaceID_RDF;
+    static PRInt32  kNameSpaceID_XUL;
+
+    static nsIRDFResource* kNC_Title;
+    static nsIRDFResource* kNC_child;
+    static nsIRDFResource* kNC_Column;
+    static nsIRDFResource* kNC_Folder;
+    static nsIRDFResource* kRDF_child;
+
+    static nsIXULSortService	*XULSortService;
+};

mozilla/rdf/content/src/nsRDFHTMLBuilder.cpp

@@ -0,0 +1,443 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/*
+
+  An nsIRDFDocument implementation that builds an HTML-like model,
+  complete with text nodes. The model can be displayed in a vanilla
+  HTML content viewer by applying CSS2 styles to the text.
+
+ */
+
+#include "nsCOMPtr.h"
+#include "nsIContent.h"
+#include "nsIDocument.h"
+#include "nsIRDFCompositeDataSource.h"
+#include "nsIRDFContentModelBuilder.h"
+#include "nsIRDFDocument.h"
+#include "nsIRDFNode.h"
+#include "nsIRDFService.h"
+#include "nsIServiceManager.h"
+#include "nsINameSpaceManager.h"
+#include "nsISupportsArray.h"
+#include "nsRDFContentUtils.h"
+#include "nsXPIDLString.h"
+#include "rdf.h"
+#include "rdfutil.h"
+#include "prlog.h"
+
+////////////////////////////////////////////////////////////////////////
+
+static NS_DEFINE_IID(kIContentIID,                NS_ICONTENT_IID);
+static NS_DEFINE_IID(kIDocumentIID,               NS_IDOCUMENT_IID);
+static NS_DEFINE_IID(kIRDFResourceIID,            NS_IRDFRESOURCE_IID);
+static NS_DEFINE_IID(kIRDFLiteralIID,             NS_IRDFLITERAL_IID);
+static NS_DEFINE_IID(kIRDFContentModelBuilderIID, NS_IRDFCONTENTMODELBUILDER_IID);
+
+////////////////////////////////////////////////////////////////////////
+
+class RDFHTMLBuilderImpl : public nsIRDFContentModelBuilder
+{
+private:
+    nsIRDFDocument*            mDocument;
+    nsIRDFCompositeDataSource* mDB;
+
+    // pseudo constants
+    PRInt32 kNameSpaceID_RDF; // note that this is a bona fide member
+
+    static nsrefcnt gRefCnt;
+    static nsIAtom* kIdAtom;
+
+public:
+    RDFHTMLBuilderImpl();
+    virtual ~RDFHTMLBuilderImpl();
+
+    // nsISupports interface
+    NS_DECL_ISUPPORTS
+
+    // nsIRDFContentModelBuilder interface
+    NS_IMETHOD SetDocument(nsIRDFDocument* aDocument);
+    NS_IMETHOD SetDataBase(nsIRDFCompositeDataSource* aDataBase);
+    NS_IMETHOD GetDataBase(nsIRDFCompositeDataSource** aDataBase);
+    NS_IMETHOD CreateRootContent(nsIRDFResource* aResource);
+    NS_IMETHOD SetRootContent(nsIContent* aElement);
+    NS_IMETHOD CreateContents(nsIContent* aElement);
+    NS_IMETHOD CreateElement(PRInt32 aNameSpaceID,
+                             nsIAtom* aTagName,
+                             nsIRDFResource* aResource,
+                             nsIContent** aResult);
+
+    // nsIRDFObserver interface
+    NS_IMETHOD OnAssert(nsIContent* aElement, nsIRDFResource* aProperty, nsIRDFNode* aValue);
+    NS_IMETHOD OnUnassert(nsIContent* aElement, nsIRDFResource* aProperty, nsIRDFNode* aValue);
+
+    // Implementation methods
+    nsresult AddTreeChild(nsIContent* aParent,
+                          nsIRDFResource* property,
+                          nsIRDFResource* value);
+
+    nsresult AddLeafChild(nsIContent* parent,
+                          nsIRDFResource* property,
+                          nsIRDFLiteral* value);
+
+    PRBool IsTreeProperty(nsIRDFResource* aProperty);
+};
+
+////////////////////////////////////////////////////////////////////////
+
+nsrefcnt RDFHTMLBuilderImpl::gRefCnt;
+nsIAtom* RDFHTMLBuilderImpl::kIdAtom;
+
+RDFHTMLBuilderImpl::RDFHTMLBuilderImpl(void)
+    : mDocument(nsnull),
+      mDB(nsnull)
+{
+	NS_INIT_REFCNT();
+
+    if (gRefCnt++ == 0) {
+        kIdAtom = NS_NewAtom("id");
+    }
+}
+
+RDFHTMLBuilderImpl::~RDFHTMLBuilderImpl(void)
+{
+    NS_IF_RELEASE(mDB);
+    // NS_IF_RELEASE(mDocument) not refcounted
+
+    if (--gRefCnt == 0) {
+        NS_RELEASE(kIdAtom);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+NS_IMPL_ISUPPORTS(RDFHTMLBuilderImpl, kIRDFContentModelBuilderIID);
+
+////////////////////////////////////////////////////////////////////////
+
+nsresult
+RDFHTMLBuilderImpl::AddTreeChild(nsIContent* parent,
+                                 nsIRDFResource* property,
+                                 nsIRDFResource* value)
+{
+    // If it's a tree property, then create a child element whose
+    // value is the value of the property. We'll also attach an "ID="
+    // attribute to the new child; e.g.,
+    //
+    // <parent>
+    //   <property id="value">
+    //      <!-- recursively generated -->
+    //   </property>
+    //   ...
+    // </parent>
+
+    nsresult rv;
+    PRInt32 nameSpaceID;
+    nsIAtom* tag = nsnull;
+    nsIContent* child = nsnull;
+    nsXPIDLCString p;
+
+    if (NS_FAILED(rv = mDocument->SplitProperty(property, &nameSpaceID, &tag)))
+        goto done;
+
+    if (NS_FAILED(rv = CreateElement(nameSpaceID, tag, value, &child)))
+        goto done;
+
+    if (NS_FAILED(rv = value->GetValue( getter_Copies(p) )))
+        goto done;
+
+    if (NS_FAILED(rv = child->SetAttribute(kNameSpaceID_HTML, kIdAtom, (const char*) p, PR_FALSE)))
+        goto done;
+
+    rv = parent->AppendChildTo(child, PR_TRUE);
+
+done:
+    NS_IF_RELEASE(child);
+    NS_IF_RELEASE(tag);
+    return rv;
+}
+
+
+nsresult
+RDFHTMLBuilderImpl::AddLeafChild(nsIContent* parent,
+                                 nsIRDFResource* property,
+                                 nsIRDFLiteral* value)
+{
+    // Otherwise, it's not a tree property. So we'll just create a
+    // new element for the property, and a simple text node for
+    // its value; e.g.,
+    //
+    // <parent>
+    //   <property>value</property>
+    //   ...
+    // </parent>
+
+    nsresult rv;
+    PRInt32 nameSpaceID;
+    nsIAtom* tag = nsnull;
+    nsIContent* child = nsnull;
+
+    if (NS_FAILED(rv = mDocument->SplitProperty(property, &nameSpaceID, &tag)))
+        goto done;
+
+    if (NS_FAILED(rv = CreateElement(nameSpaceID, tag, property, &child)))
+        goto done;
+
+    if (NS_FAILED(rv = parent->AppendChildTo(child, PR_TRUE)))
+        goto done;
+
+    rv = nsRDFContentUtils::AttachTextNode(child, value);
+
+done:
+    NS_IF_RELEASE(tag);
+    NS_IF_RELEASE(child);
+    return rv;
+}
+
+
+NS_IMETHODIMP
+RDFHTMLBuilderImpl::SetDocument(nsIRDFDocument* aDocument)
+{
+    // note: document can now be null to indicate going away
+    mDocument = aDocument; // not refcounted
+    if (aDocument != nsnull)
+    {
+	    nsCOMPtr<nsIDocument> doc( do_QueryInterface(mDocument) );
+	    if (doc) {
+		nsCOMPtr<nsINameSpaceManager> mgr;
+		doc->GetNameSpaceManager( *getter_AddRefs(mgr) );
+		if (mgr) {
+	static const char kRDFNameSpaceURI[] = RDF_NAMESPACE_URI;
+		    mgr->GetNameSpaceID(kRDFNameSpaceURI, kNameSpaceID_RDF);
+		}
+	    }
+    }
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP
+RDFHTMLBuilderImpl::SetDataBase(nsIRDFCompositeDataSource* aDataBase)
+{
+    NS_PRECONDITION(aDataBase != nsnull, "null ptr");
+    if (! aDataBase)
+        return NS_ERROR_NULL_POINTER;
+
+    NS_PRECONDITION(mDB == nsnull, "already initialized");
+    if (mDB)
+        return NS_ERROR_ALREADY_INITIALIZED;
+
+    mDB = aDataBase;
+    NS_ADDREF(mDB);
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP
+RDFHTMLBuilderImpl::GetDataBase(nsIRDFCompositeDataSource** aDataBase)
+{
+    NS_PRECONDITION(aDataBase != nsnull, "null ptr");
+    if (! aDataBase)
+        return NS_ERROR_NULL_POINTER;
+
+    *aDataBase = mDB;
+    NS_ADDREF(mDB);
+    return NS_OK;
+}
+
+
+
+NS_IMETHODIMP
+RDFHTMLBuilderImpl::CreateRootContent(nsIRDFResource* aResource)
+{
+    NS_PRECONDITION(mDocument != nsnull, "not initialized");
+    if (! mDocument)
+        return NS_ERROR_NOT_INITIALIZED;
+
+    nsresult rv;
+    nsIAtom* tag        = nsnull;
+    nsIDocument* doc    = nsnull;
+    nsIContent* root    = nsnull;
+    nsIContent* body = nsnull;
+
+    if (NS_FAILED(rv = mDocument->QueryInterface(kIDocumentIID, (void**) &doc)))
+        goto done;
+
+    rv = NS_ERROR_OUT_OF_MEMORY;
+    if ((tag = NS_NewAtom("document")) == nsnull)
+        goto done;
+
+    if (NS_FAILED(rv = NS_NewRDFElement(kNameSpaceID_None, tag, &root)))
+        goto done;
+
+    doc->SetRootContent(NS_STATIC_CAST(nsIContent*, root));
+
+    NS_RELEASE(tag);
+
+    rv = NS_ERROR_OUT_OF_MEMORY;
+    if ((tag = NS_NewAtom("body")) == nsnull)
+        goto done;
+
+    // PR_TRUE indicates that children should be recursively generated on demand
+    if (NS_FAILED(rv = CreateElement(kNameSpaceID_None, tag, aResource, &body)))
+        goto done;
+
+    if (NS_FAILED(rv = root->AppendChildTo(body, PR_FALSE)))
+        goto done;
+
+done:
+    NS_IF_RELEASE(body); 
+    NS_IF_RELEASE(root);
+    NS_IF_RELEASE(tag);
+    NS_IF_RELEASE(doc);
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP
+RDFHTMLBuilderImpl::SetRootContent(nsIContent* aElement)
+{
+    NS_NOTYETIMPLEMENTED("write me");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+RDFHTMLBuilderImpl::CreateContents(nsIContent* aElement)
+{
+    NS_NOTYETIMPLEMENTED("Adapt the implementation from RDFTreeBuilderImpl");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+NS_IMETHODIMP
+RDFHTMLBuilderImpl::CreateElement(PRInt32 aNameSpaceID,
+                                  nsIAtom* aTag,
+                                  nsIRDFResource* aResource,
+                                  nsIContent** aResult)
+{
+    nsresult rv;
+
+    nsCOMPtr<nsIContent> result;
+    if (NS_FAILED(rv = NS_NewRDFElement(aNameSpaceID, aTag, getter_AddRefs(result))))
+        return rv;
+
+    nsXPIDLCString uri;
+    if (NS_FAILED(rv = aResource->GetValue( getter_Copies(uri) )))
+        return rv;
+
+    if (NS_FAILED(rv = result->SetAttribute(kNameSpaceID_None, kIdAtom, (const char*) uri, PR_FALSE)))
+        return rv;
+
+    *aResult = result;
+    NS_ADDREF(*aResult);
+    return NS_OK;
+}
+
+
+
+NS_IMETHODIMP
+RDFHTMLBuilderImpl::OnAssert(nsIContent* parent,
+                             nsIRDFResource* property,
+                             nsIRDFNode* value)
+{
+    NS_PRECONDITION(mDocument != nsnull, "not initialized");
+    if (! mDocument)
+        return NS_ERROR_NOT_INITIALIZED;
+
+    nsresult rv;
+
+    nsIRDFResource* valueResource;
+    if (NS_SUCCEEDED(rv = value->QueryInterface(kIRDFResourceIID, (void**) &valueResource))) {
+        // If it's a tree property or an RDF container, then add it as
+        // a tree child and return.
+        if (IsTreeProperty(property) /* || rdf_IsContainer(mDB, valueResource) */) {
+            rv = AddTreeChild(parent, property, valueResource);
+            NS_RELEASE(valueResource);
+            return rv;
+        }
+
+        // Otherwise, fall through and add try to add it as a property
+        NS_RELEASE(valueResource);
+    }
+
+    nsIRDFLiteral* valueLiteral;
+    if (NS_SUCCEEDED(rv = value->QueryInterface(kIRDFLiteralIID, (void**) &valueLiteral))) {
+        rv = AddLeafChild(parent, property, valueLiteral);
+        NS_RELEASE(valueLiteral);
+    }
+	else {
+		return NS_OK; // ignore resources on the leaf.
+	}
+    return rv;
+}
+
+
+NS_IMETHODIMP
+RDFHTMLBuilderImpl::OnUnassert(nsIContent* parent,
+                               nsIRDFResource* property,
+                               nsIRDFNode* value)
+{
+    PR_ASSERT(0);
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+PRBool
+RDFHTMLBuilderImpl::IsTreeProperty(nsIRDFResource* aProperty)
+{
+    // XXX This whole method is a mega-kludge. This should be read off
+    // of the element somehow...
+
+#define TREE_PROPERTY_HACK
+#if defined(TREE_PROPERTY_HACK)
+    nsXPIDLCString p;
+    aProperty->GetValue( getter_Copies(p) );
+    nsAutoString s(p);
+    if (s.Equals(NC_NAMESPACE_URI "child") ||
+        s.Equals(NC_NAMESPACE_URI "Folder") ||
+		s.Equals(NC_NAMESPACE_URI "Columns") ||
+		s.Equals(RDF_NAMESPACE_URI "child")) {
+        return PR_TRUE;
+    }
+#endif // defined(TREE_PROPERTY_HACK)
+#if 0
+    if (rdf_IsOrdinalProperty(aProperty)) {
+        return PR_TRUE;
+    }
+#endif
+    return PR_FALSE;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+nsresult
+NS_NewRDFHTMLBuilder(nsIRDFContentModelBuilder** result)
+{
+    NS_PRECONDITION(result != nsnull, "null ptr");
+    if (! result)
+        return NS_ERROR_NULL_POINTER;
+
+    RDFHTMLBuilderImpl* builder = new RDFHTMLBuilderImpl();
+    if (! builder)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(builder);
+    *result = builder;
+    return NS_OK;
+}

mozilla/rdf/content/src/nsRDFMenuBuilder.cpp

@@ -0,0 +1,447 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+
+#include "nsCOMPtr.h"
+#include "nsCRT.h"
+#include "nsIAtom.h"
+#include "nsIContent.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMElementObserver.h"
+#include "nsIDOMNode.h"
+#include "nsIDOMNodeObserver.h"
+#include "nsIDocument.h"
+#include "nsINameSpaceManager.h"
+#include "nsIRDFContentModelBuilder.h"
+#include "nsIRDFCompositeDataSource.h"
+#include "nsIRDFDocument.h"
+#include "nsIRDFNode.h"
+#include "nsIRDFObserver.h"
+#include "nsIRDFService.h"
+#include "nsIServiceManager.h"
+#include "nsINameSpaceManager.h"
+#include "nsIServiceManager.h"
+#include "nsISupportsArray.h"
+#include "nsIURL.h"
+#include "nsLayoutCID.h"
+#include "nsRDFCID.h"
+#include "nsRDFContentUtils.h"
+#include "nsString.h"
+#include "nsXPIDLString.h"
+#include "rdf.h"
+#include "rdfutil.h"
+#include "nsITimer.h"
+#include "nsVoidArray.h"
+
+#include "nsRDFGenericBuilder.h"
+
+////////////////////////////////////////////////////////////////////////
+
+static NS_DEFINE_IID(kIContentIID,                NS_ICONTENT_IID);
+static NS_DEFINE_IID(kIDocumentIID,               NS_IDOCUMENT_IID);
+static NS_DEFINE_IID(kINameSpaceManagerIID,       NS_INAMESPACEMANAGER_IID);
+static NS_DEFINE_IID(kIRDFResourceIID,            NS_IRDFRESOURCE_IID);
+static NS_DEFINE_IID(kIRDFLiteralIID,             NS_IRDFLITERAL_IID);
+static NS_DEFINE_IID(kIRDFContentModelBuilderIID, NS_IRDFCONTENTMODELBUILDER_IID);
+static NS_DEFINE_IID(kIRDFObserverIID,            NS_IRDFOBSERVER_IID);
+static NS_DEFINE_IID(kIRDFServiceIID,             NS_IRDFSERVICE_IID);
+static NS_DEFINE_IID(kISupportsIID,               NS_ISUPPORTS_IID);
+
+static NS_DEFINE_CID(kNameSpaceManagerCID,        NS_NAMESPACEMANAGER_CID);
+static NS_DEFINE_CID(kRDFServiceCID,              NS_RDFSERVICE_CID);
+
+////////////////////////////////////////////////////////////////////////
+
+class RDFMenuBuilderImpl : public RDFGenericBuilderImpl
+{
+public:
+    RDFMenuBuilderImpl();
+    virtual ~RDFMenuBuilderImpl();
+
+    // Implementation methods
+    nsresult
+    AddWidgetItem(nsIContent* aMenuItemElement,
+                  nsIRDFResource* aProperty,
+                  nsIRDFResource* aValue, PRInt32 aNaturalOrderPos);
+
+    nsresult
+    RemoveWidgetItem(nsIContent* aMenuItemElement,
+                     nsIRDFResource* aProperty,
+                     nsIRDFResource* aValue);
+
+    nsresult
+    SetWidgetAttribute(nsIContent* aMenuItemElement,
+                       nsIRDFResource* aProperty,
+                       nsIRDFNode* aValue);
+
+    nsresult
+    UnsetWidgetAttribute(nsIContent* aMenuItemElement,
+                         nsIRDFResource* aProperty,
+                         nsIRDFNode* aValue);
+
+    nsresult 
+    GetRootWidgetAtom(nsIAtom** aResult) {
+        NS_ADDREF(kMenuAtom);
+        *aResult = kMenuAtom;
+        return NS_OK;
+    }
+
+    nsresult
+    GetWidgetItemAtom(nsIAtom** aResult) {
+        NS_ADDREF(kMenuItemAtom);
+        *aResult = kMenuItemAtom;
+        return NS_OK;
+    }
+
+    nsresult
+    GetWidgetFolderAtom(nsIAtom** aResult) {
+        NS_ADDREF(kMenuAtom);
+        *aResult = kMenuAtom;
+        return NS_OK;
+    }
+
+    nsresult
+    GetInsertionRootAtom(nsIAtom** aResult) {
+        NS_ADDREF(kMenuAtom);
+        *aResult = kMenuAtom;
+        return NS_OK;
+    }
+
+    nsresult
+    GetItemAtomThatContainsTheChildren(nsIAtom** aResult) {
+        NS_ADDREF(kMenuAtom);
+        *aResult = kMenuAtom;
+        return NS_OK;
+    }
+
+    void
+    Notify(nsITimer *timer);
+
+    // pseudo-constants
+    static nsrefcnt gRefCnt;
+ 
+    static nsIAtom* kMenuBarAtom;
+    static nsIAtom* kMenuAtom;
+    static nsIAtom* kMenuItemAtom;
+    static nsIAtom* kNameAtom;
+};
+
+////////////////////////////////////////////////////////////////////////
+
+nsrefcnt RDFMenuBuilderImpl::gRefCnt = 0;
+
+nsIAtom* RDFMenuBuilderImpl::kMenuAtom;
+nsIAtom* RDFMenuBuilderImpl::kMenuItemAtom;
+nsIAtom* RDFMenuBuilderImpl::kMenuBarAtom;
+nsIAtom* RDFMenuBuilderImpl::kNameAtom;
+
+////////////////////////////////////////////////////////////////////////
+
+nsresult
+NS_NewRDFMenuBuilder(nsIRDFContentModelBuilder** result)
+{
+    NS_PRECONDITION(result != nsnull, "null ptr");
+    if (! result)
+        return NS_ERROR_NULL_POINTER;
+
+    RDFMenuBuilderImpl* builder = new RDFMenuBuilderImpl();
+    if (! builder)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(builder);
+    *result = builder;
+    return NS_OK;
+}
+
+
+
+RDFMenuBuilderImpl::RDFMenuBuilderImpl(void)
+    : RDFGenericBuilderImpl()
+{
+    if (gRefCnt == 0) {
+        kMenuAtom            = NS_NewAtom("menu");
+        kMenuItemAtom        = NS_NewAtom("menuitem");
+        kMenuBarAtom         = NS_NewAtom("menubar");
+        kNameAtom            = NS_NewAtom("name");
+    }
+
+    ++gRefCnt;
+}
+
+RDFMenuBuilderImpl::~RDFMenuBuilderImpl(void)
+{
+    --gRefCnt;
+    if (gRefCnt == 0) {
+        NS_RELEASE(kMenuAtom);
+        NS_RELEASE(kMenuItemAtom);
+        NS_RELEASE(kMenuBarAtom);
+        NS_RELEASE(kNameAtom);
+    }
+}
+
+void
+RDFMenuBuilderImpl::Notify(nsITimer *timer)
+{
+}
+
+////////////////////////////////////////////////////////////////////////
+// Implementation methods
+
+nsresult
+RDFMenuBuilderImpl::AddWidgetItem(nsIContent* aElement,
+                                  nsIRDFResource* aProperty,
+                                  nsIRDFResource* aValue,
+                                  PRInt32 naturalOrderPos)
+{
+    nsresult rv;
+
+    nsCOMPtr<nsIContent> menuParent;
+    menuParent = dont_QueryInterface(aElement);
+    if (!IsItemOrFolder(aElement) && !IsWidgetInsertionRootElement(aElement))
+    {
+        NS_ERROR("Can't add something here!");
+        return NS_ERROR_UNEXPECTED;
+    }
+
+    // Find out if we're a container or not.
+    PRBool markAsContainer = IsContainer(aElement, aValue);
+    nsCOMPtr<nsIAtom> itemAtom;
+    
+    // Figure out what atom to use based on whether or not we're a container
+    // or leaf
+    if (markAsContainer)
+    {
+        // We're a menu element
+        GetWidgetFolderAtom(getter_AddRefs(itemAtom));
+    }
+    else
+    {
+        // We're a menuitem element
+        GetWidgetItemAtom(getter_AddRefs(itemAtom));
+    }
+
+    // Create the <xul:menuitem> element
+    nsCOMPtr<nsIContent> menuItem;
+    if (NS_FAILED(rv = CreateElement(kNameSpaceID_XUL,
+                                     itemAtom,
+                                     aValue,
+                                     getter_AddRefs(menuItem))))
+        return rv;
+
+    // Add the new menu item to the <xul:menu> element.
+    menuParent->AppendChildTo(menuItem, PR_TRUE);
+
+    // Add miscellaneous attributes by iterating _all_ of the
+    // properties out of the resource.
+    nsCOMPtr<nsISimpleEnumerator> arcs;
+    rv = mDB->ArcLabelsOut(aValue, getter_AddRefs(arcs));
+    NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get arcs out");
+    if (NS_FAILED(rv)) return rv;
+
+    while (1) {
+        PRBool hasMore;
+        rv = arcs->HasMoreElements(&hasMore);
+        if (NS_FAILED(rv)) return rv;
+
+        if (! hasMore)
+            break;
+
+        nsCOMPtr<nsISupports> isupports;
+        rv = arcs->GetNext(getter_AddRefs(isupports));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get cursor value");
+        if (NS_FAILED(rv)) return rv;
+
+        nsCOMPtr<nsIRDFResource> property = do_QueryInterface(isupports);
+
+        // Ignore properties that are used to indicate containment
+        if (IsContainmentProperty(aElement, property))
+            continue;
+
+        // Ignore properties that we have been explicitly _asked_ to
+        // ignore.
+        if (IsIgnoredProperty(aElement, property))
+            continue;
+
+        PRInt32 nameSpaceID;
+        nsCOMPtr<nsIAtom> tag;
+        if (NS_FAILED(rv = mDocument->SplitProperty(property, &nameSpaceID, getter_AddRefs(tag)))) {
+            NS_ERROR("unable to split property");
+            return rv;
+        }
+
+        nsCOMPtr<nsIRDFNode> value;
+        if (NS_FAILED(rv = mDB->GetTarget(aValue, property, PR_TRUE, getter_AddRefs(value)))) {
+            NS_ERROR("unable to get target");
+            return rv;
+        }
+
+        // ArcsLabelsOut is allowed to be promiscuous, giving back
+        // potential arc labels that may not currently have a value.
+        if (rv == NS_RDF_NO_VALUE)
+            continue;
+
+        nsAutoString s;
+        rv = nsRDFContentUtils::GetTextForNode(value, s);
+        if (NS_FAILED(rv)) return rv;
+
+        rv = menuItem->SetAttribute(nameSpaceID, tag, s, PR_FALSE);
+        if (NS_FAILED(rv)) return rv;
+
+        // XXX This should go away and just be determined dynamically;
+        // e.g., by setting an attribute on the "xul:menu" tag
+        nsAutoString tagStr;
+        tag->ToString(tagStr);
+        if (tagStr.EqualsIgnoreCase("name")) {
+            // Hack to ensure that we add in a lowercase name attribute also.
+            menuItem->SetAttribute(kNameSpaceID_None, kNameAtom, s, PR_FALSE);
+        }
+    }
+
+    // XXX: This is a hack until the menu folks get their act together.
+    menuItem->SetAttribute(kNameSpaceID_None, kOpenAtom, "true", PR_FALSE);
+
+    // Finally, mark this as a "container" so that we know to
+    // recursively generate kids if they're asked for.
+    if (markAsContainer == PR_TRUE)
+    {
+        // Finally, mark this as a "container" so that we know to
+        // recursively generate kids if they're asked for.
+        if (NS_FAILED(rv = menuItem->SetAttribute(kNameSpaceID_RDF, kContainerAtom, "true", PR_FALSE)))
+            return rv;
+    }
+
+    return NS_OK;
+}
+
+
+nsresult
+RDFMenuBuilderImpl::RemoveWidgetItem(nsIContent* aMenuItemElement,
+                                     nsIRDFResource* aProperty,
+                                     nsIRDFResource* aValue)
+{
+    nsresult rv;
+
+    // Find the doomed kid and blow it away.
+    PRInt32 count;
+    if (NS_FAILED(rv = aMenuItemElement->ChildCount(count)))
+        return rv;
+
+    for (PRInt32 i = 0; i < count; ++i) {
+        nsCOMPtr<nsIContent> kid;
+        rv = aMenuItemElement->ChildAt(i, *getter_AddRefs(kid));
+        if (NS_FAILED(rv)) return rv;
+
+        // Make sure it's a <xul:menu> or <xul:menuitem>
+        PRInt32 nameSpaceID;
+        rv = kid->GetNameSpaceID(nameSpaceID);
+        if (NS_FAILED(rv)) return rv;
+
+        if (nameSpaceID != kNameSpaceID_XUL)
+            continue; // wrong namespace
+
+        nsCOMPtr<nsIAtom> tag;
+        rv = kid->GetTag(*getter_AddRefs(tag));
+        if (NS_FAILED(rv)) return rv;
+
+        if ((tag.get() != kMenuItemAtom) &&
+            (tag.get() != kMenuAtom))
+            continue; // wrong tag
+
+        // Now get the resource ID from the RDF:ID attribute. We do it
+        // via the content model, because you're never sure who
+        // might've added this stuff in...
+        nsCOMPtr<nsIRDFResource> resource;
+        rv = nsRDFContentUtils::GetElementResource(kid, getter_AddRefs(resource));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "severe error retrieving resource");
+        if(NS_FAILED(rv)) return rv;
+
+        if (resource.get() != aValue)
+            continue; // not the resource we want
+
+        // Fount it! Now kill it.
+        rv = aMenuItemElement->RemoveChildAt(i, PR_TRUE);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "unable to remove xul:menu[item] from xul:menu");
+        if (NS_FAILED(rv)) return rv;
+
+        return NS_OK;
+    }
+
+    // XXX make this a warning
+    NS_WARNING("unable to find child to remove");
+    return NS_OK;
+}
+
+nsresult
+RDFMenuBuilderImpl::SetWidgetAttribute(nsIContent* aMenuItemElement,
+                                       nsIRDFResource* aProperty,
+                                       nsIRDFNode* aValue)
+{
+    nsresult rv;
+
+    PRInt32 nameSpaceID;
+    nsCOMPtr<nsIAtom> tag;
+    rv = mDocument->SplitProperty(aProperty, &nameSpaceID, getter_AddRefs(tag));
+    if (NS_FAILED(rv)) return rv;
+
+    nsAutoString value;
+    rv = nsRDFContentUtils::GetTextForNode(aValue, value);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = aMenuItemElement->SetAttribute(nameSpaceID, tag, value, PR_TRUE);
+    if (NS_FAILED(rv)) return rv;
+
+    // XXX This should go away and just be determined dynamically;
+    // e.g., by setting an attribute on the "xul:menu" tag.
+    nsAutoString tagStr;
+    tag->ToString(tagStr);
+    if (tagStr.EqualsIgnoreCase("name")) {
+        // Hack to ensure that we add in a lowercase name attribute also.
+        aMenuItemElement->SetAttribute(kNameSpaceID_None, kNameAtom, value, PR_TRUE);
+    }
+
+    return NS_OK;
+}
+
+nsresult
+RDFMenuBuilderImpl::UnsetWidgetAttribute(nsIContent* aMenuItemElement,
+                                         nsIRDFResource* aProperty,
+                                         nsIRDFNode* aValue)
+{
+    nsresult rv;
+
+    PRInt32 nameSpaceID;
+    nsCOMPtr<nsIAtom> tag;
+    rv = mDocument->SplitProperty(aProperty, &nameSpaceID, getter_AddRefs(tag));
+    if (NS_FAILED(rv)) return rv;
+
+    rv = aMenuItemElement->UnsetAttribute(nameSpaceID, tag, PR_TRUE);
+    if (NS_FAILED(rv)) return rv;
+
+    // XXX This should go away and just be determined dynamically;
+    // e.g., by setting an attribute on the "xul:menu" tag.
+    nsAutoString tagStr;
+    tag->ToString(tagStr);
+    if (tagStr.EqualsIgnoreCase("name")) {
+        // Hack to ensure that we add in a lowercase name attribute also.
+        aMenuItemElement->UnsetAttribute(kNameSpaceID_None, kNameAtom, PR_TRUE);
+    }
+
+    return NS_OK;
+}
+

mozilla/rdf/content/src/nsRDFToolbarBuilder.cpp

@@ -0,0 +1,441 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+/* XXX: Teach this how to make toolboxes as well as toolbars. */
+
+#include "nsCOMPtr.h"
+#include "nsCRT.h"
+#include "nsIAtom.h"
+#include "nsIContent.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMElementObserver.h"
+#include "nsIDOMNode.h"
+#include "nsIDOMNodeObserver.h"
+#include "nsIDocument.h"
+#include "nsINameSpaceManager.h"
+#include "nsIRDFContentModelBuilder.h"
+#include "nsIRDFCompositeDataSource.h"
+#include "nsIRDFDocument.h"
+#include "nsIRDFNode.h"
+#include "nsIRDFObserver.h"
+#include "nsIRDFService.h"
+#include "nsIServiceManager.h"
+#include "nsINameSpaceManager.h"
+#include "nsIServiceManager.h"
+#include "nsISupportsArray.h"
+#include "nsIURL.h"
+#include "nsLayoutCID.h"
+#include "nsRDFCID.h"
+#include "nsRDFContentUtils.h"
+#include "nsString.h"
+#include "nsXPIDLString.h"
+#include "rdf.h"
+#include "rdfutil.h"
+
+#include "nsVoidArray.h"
+
+#include "nsRDFGenericBuilder.h"
+
+////////////////////////////////////////////////////////////////////////
+
+static NS_DEFINE_IID(kIContentIID,                NS_ICONTENT_IID);
+static NS_DEFINE_IID(kIDocumentIID,               NS_IDOCUMENT_IID);
+static NS_DEFINE_IID(kINameSpaceManagerIID,       NS_INAMESPACEMANAGER_IID);
+static NS_DEFINE_IID(kIRDFResourceIID,            NS_IRDFRESOURCE_IID);
+static NS_DEFINE_IID(kIRDFLiteralIID,             NS_IRDFLITERAL_IID);
+static NS_DEFINE_IID(kIRDFContentModelBuilderIID, NS_IRDFCONTENTMODELBUILDER_IID);
+static NS_DEFINE_IID(kIRDFObserverIID,            NS_IRDFOBSERVER_IID);
+static NS_DEFINE_IID(kIRDFServiceIID,             NS_IRDFSERVICE_IID);
+static NS_DEFINE_IID(kISupportsIID,               NS_ISUPPORTS_IID);
+
+static NS_DEFINE_CID(kNameSpaceManagerCID,        NS_NAMESPACEMANAGER_CID);
+static NS_DEFINE_CID(kRDFServiceCID,              NS_RDFSERVICE_CID);
+
+////////////////////////////////////////////////////////////////////////
+
+class RDFToolbarBuilderImpl : public RDFGenericBuilderImpl
+{
+public:
+    RDFToolbarBuilderImpl();
+    virtual ~RDFToolbarBuilderImpl();
+
+    // Implementation methods
+    nsresult
+    AddWidgetItem(nsIContent* aToolbarItemElement,
+                  nsIRDFResource* aProperty,
+                  nsIRDFResource* aValue, PRInt32 aNaturalOrderPos);
+
+    nsresult
+    RemoveWidgetItem(nsIContent* aTreeItemElement,
+                     nsIRDFResource* aProperty,
+                     nsIRDFResource* aValue);
+
+    nsresult
+    SetWidgetAttribute(nsIContent* aToolbarItemElement,
+                       nsIRDFResource* aProperty,
+                       nsIRDFNode* aValue);
+
+    nsresult
+    UnsetWidgetAttribute(nsIContent* aToolbarItemElement,
+                         nsIRDFResource* aProperty,
+                         nsIRDFNode* aValue);
+
+    nsresult 
+    GetRootWidgetAtom(nsIAtom** aResult) {
+        NS_ADDREF(kToolbarAtom);
+        *aResult = kToolbarAtom;
+        return NS_OK;
+    }
+
+    nsresult
+    GetWidgetItemAtom(nsIAtom** aResult) {
+        NS_ADDREF(kTitledButtonAtom);
+        *aResult = kTitledButtonAtom;
+        return NS_OK;
+    }
+
+    nsresult
+    GetWidgetFolderAtom(nsIAtom** aResult) {
+        NS_ADDREF(kTitledButtonAtom);
+        *aResult = kTitledButtonAtom;
+        return NS_OK;
+    }
+
+    nsresult
+    GetInsertionRootAtom(nsIAtom** aResult) {
+        NS_ADDREF(kToolbarAtom);
+        *aResult = kToolbarAtom;
+        return NS_OK;
+    }
+
+    nsresult
+    GetItemAtomThatContainsTheChildren(nsIAtom** aResult) {
+        NS_ADDREF(kTitledButtonAtom);
+        *aResult = kTitledButtonAtom;
+        return NS_OK;
+    }
+
+    void
+    Notify(nsITimer *timer);
+
+    // pseudo-constants
+    static nsrefcnt gRefCnt;
+ 
+    static nsIAtom* kToolbarAtom;
+    static nsIAtom* kTitledButtonAtom;
+    static nsIAtom* kAlignAtom;
+    static nsIAtom* kSrcAtom;
+    static nsIAtom* kValueAtom;
+};
+
+////////////////////////////////////////////////////////////////////////
+
+nsrefcnt RDFToolbarBuilderImpl::gRefCnt = 0;
+
+nsIAtom* RDFToolbarBuilderImpl::kToolbarAtom;
+nsIAtom* RDFToolbarBuilderImpl::kTitledButtonAtom;
+nsIAtom* RDFToolbarBuilderImpl::kAlignAtom;
+nsIAtom* RDFToolbarBuilderImpl::kSrcAtom;
+nsIAtom* RDFToolbarBuilderImpl::kValueAtom;
+
+////////////////////////////////////////////////////////////////////////
+
+nsresult
+NS_NewRDFToolbarBuilder(nsIRDFContentModelBuilder** result)
+{
+    NS_PRECONDITION(result != nsnull, "null ptr");
+    if (! result)
+        return NS_ERROR_NULL_POINTER;
+
+    RDFToolbarBuilderImpl* builder = new RDFToolbarBuilderImpl();
+    if (! builder)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(builder);
+    *result = builder;
+    return NS_OK;
+}
+
+
+
+RDFToolbarBuilderImpl::RDFToolbarBuilderImpl(void)
+    : RDFGenericBuilderImpl()
+{
+    if (gRefCnt == 0) {
+        kToolbarAtom      = NS_NewAtom("toolbar");
+        kTitledButtonAtom = NS_NewAtom("titledbutton");
+        kAlignAtom        = NS_NewAtom("align");
+        kSrcAtom          = NS_NewAtom("src");
+        kValueAtom        = NS_NewAtom("value");
+    }
+
+    ++gRefCnt;
+}
+
+RDFToolbarBuilderImpl::~RDFToolbarBuilderImpl(void)
+{
+    --gRefCnt;
+    if (gRefCnt == 0) {
+        
+        NS_RELEASE(kToolbarAtom);
+        NS_RELEASE(kTitledButtonAtom);
+        NS_RELEASE(kAlignAtom);
+        NS_RELEASE(kSrcAtom);
+        NS_RELEASE(kValueAtom);
+    }
+}
+
+void
+RDFToolbarBuilderImpl::Notify(nsITimer *timer)
+{
+}
+
+////////////////////////////////////////////////////////////////////////
+// Implementation methods
+
+nsresult
+RDFToolbarBuilderImpl::AddWidgetItem(nsIContent* aElement,
+                                     nsIRDFResource* aProperty,
+                                     nsIRDFResource* aValue,
+                                     PRInt32 naturalOrderPos)
+{
+    nsresult rv;
+
+    nsCOMPtr<nsIContent> toolbarParent;
+    toolbarParent = dont_QueryInterface(aElement);
+    if (!IsItemOrFolder(aElement) && !IsWidgetInsertionRootElement(aElement))
+    {
+        NS_ERROR("Can't add something here!");
+        return NS_ERROR_UNEXPECTED;
+    }
+
+    PRBool markAsContainer = IsContainer(aElement, aValue);
+
+    // Create the <xul:titledbutton> element
+    nsCOMPtr<nsIContent> toolbarItem;
+    if (NS_FAILED(rv = CreateElement(kNameSpaceID_XUL,
+                                     kTitledButtonAtom,
+                                     aValue,
+                                     getter_AddRefs(toolbarItem))))
+        return rv;
+
+    // Add the <xul:titledbutton> to the <xul:toolbar> element.
+    toolbarParent->AppendChildTo(toolbarItem, PR_TRUE);
+
+    // Add miscellaneous attributes by iterating _all_ of the
+    // properties out of the resource.
+
+    // XXX Per Bug 3367, this'll have to be fixed.
+    nsCOMPtr<nsISimpleEnumerator> arcs;
+    rv = mDB->ArcLabelsOut(aValue, getter_AddRefs(arcs));
+    NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get arcs out");
+    if (NS_FAILED(rv)) return rv;
+
+    while (1) {
+        PRBool hasMore;
+        rv = arcs->HasMoreElements(&hasMore);
+        if (NS_FAILED(rv)) return rv;
+
+        if (! hasMore)
+            break;
+
+        nsCOMPtr<nsISupports> isupports;
+        rv = arcs->GetNext(getter_AddRefs(isupports));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get cursor value");
+        if (NS_FAILED(rv)) return rv;
+
+        nsCOMPtr<nsIRDFResource> property = do_QueryInterface(isupports);
+
+        // Ignore properties that are used to indicate containment
+        if (IsContainmentProperty(aElement, property))
+            continue;
+
+        // Ignore properties that we have been explicitly _asked_ to
+        // ignore.
+        if (IsIgnoredProperty(aElement, property))
+            continue;
+
+        PRInt32 nameSpaceID;
+        nsCOMPtr<nsIAtom> tag;
+        if (NS_FAILED(rv = mDocument->SplitProperty(property, &nameSpaceID, getter_AddRefs(tag)))) {
+            NS_ERROR("unable to split property");
+            return rv;
+        }
+
+        nsCOMPtr<nsIRDFNode> value;
+        if (NS_FAILED(rv = mDB->GetTarget(aValue, property, PR_TRUE, getter_AddRefs(value)))) {
+            NS_ERROR("unable to get target");
+            return rv;
+        }
+
+        // ArcsLabelsOut is allowed to be promiscuous, giving back
+        // potential arc labels that may not currently have a value.
+        if (rv == NS_RDF_NO_VALUE)
+            continue;
+
+        nsAutoString s;
+        rv = nsRDFContentUtils::GetTextForNode(value, s);
+        if (NS_FAILED(rv)) return rv;
+
+        toolbarItem->SetAttribute(nameSpaceID, tag, s, PR_FALSE);
+
+        nsString tagStr;
+        tag->ToString(tagStr);
+        if (tagStr.EqualsIgnoreCase("name")) {
+            // Hack to ensure that we add in a lowercase value attribute also.
+            toolbarItem->SetAttribute(kNameSpaceID_None, kValueAtom, s, PR_FALSE);
+        }
+
+        // XXX (Dave) I want these to go away. Style sheets should be used for these.
+        toolbarItem->SetAttribute(kNameSpaceID_None, kAlignAtom, "right", PR_FALSE);
+        toolbarItem->SetAttribute(kNameSpaceID_None, kSrcAtom,   "resource:/res/toolbar/TB_Location.gif", PR_FALSE);
+    }
+
+    // Finally, mark this as a "container" so that we know to
+    // recursively generate kids if they're asked for.
+    if (markAsContainer == PR_TRUE)
+    {
+        // Finally, mark this as a "container" so that we know to
+        // recursively generate kids if they're asked for.
+        if (NS_FAILED(rv = toolbarItem->SetAttribute(kNameSpaceID_RDF, kContainerAtom, "true", PR_FALSE)))
+            return rv;
+    }
+
+    return NS_OK;
+}
+
+
+
+nsresult
+RDFToolbarBuilderImpl::RemoveWidgetItem(nsIContent* aToolbarItemElement,
+                                        nsIRDFResource* aProperty,
+                                        nsIRDFResource* aValue)
+{
+    nsresult rv;
+
+    // Find the doomed kid and blow it away.
+    PRInt32 count;
+    if (NS_FAILED(rv = aToolbarItemElement->ChildCount(count)))
+        return rv;
+
+    for (PRInt32 i = 0; i < count; ++i) {
+        nsCOMPtr<nsIContent> kid;
+        rv = aToolbarItemElement->ChildAt(i, *getter_AddRefs(kid));
+        if (NS_FAILED(rv)) return rv;
+
+        // Make sure it's a <xul:toolbar> or <xul:titledbutton>
+        PRInt32 nameSpaceID;
+        rv = kid->GetNameSpaceID(nameSpaceID);
+        if (NS_FAILED(rv)) return rv;
+
+        if (nameSpaceID != kNameSpaceID_XUL)
+            continue; // wrong namespace
+
+        nsCOMPtr<nsIAtom> tag;
+        rv = kid->GetTag(*getter_AddRefs(tag));
+        if (NS_FAILED(rv)) return rv;
+
+        if ((tag.get() != kTitledButtonAtom) &&
+            (tag.get() != kToolbarAtom))
+            continue; // wrong tag
+
+        // Now get the resource ID from the RDF:ID attribute. We do it
+        // via the content model, because you're never sure who
+        // might've added this stuff in...
+        nsCOMPtr<nsIRDFResource> resource;
+        rv = nsRDFContentUtils::GetElementResource(kid, getter_AddRefs(resource));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "severe error retrieving resource");
+        if(NS_FAILED(rv)) return rv;
+
+        if (resource.get() != aValue)
+            continue; // not the resource we want
+
+        // Fount it! Now kill it.
+        rv = aToolbarItemElement->RemoveChildAt(i, PR_TRUE);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "unable to remove xul:toolbar/titledbutton from xul:toolbar");
+        if (NS_FAILED(rv)) return rv;
+
+        return NS_OK;
+    }
+
+    // XXX make this a warning
+    NS_WARNING("unable to find child to remove");
+    return NS_OK;
+}
+
+
+nsresult
+RDFToolbarBuilderImpl::SetWidgetAttribute(nsIContent* aToolbarItemElement,
+                                          nsIRDFResource* aProperty,
+                                          nsIRDFNode* aValue)
+{
+    nsresult rv;
+
+    PRInt32 nameSpaceID;
+    nsCOMPtr<nsIAtom> tag;
+    rv = mDocument->SplitProperty(aProperty, &nameSpaceID, getter_AddRefs(tag));
+    if (NS_FAILED(rv)) return rv;
+
+    nsAutoString value;
+    rv = nsRDFContentUtils::GetTextForNode(aValue, value);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = aToolbarItemElement->SetAttribute(nameSpaceID, tag, value, PR_TRUE);
+    if (NS_FAILED(rv)) return rv;
+
+    // XXX This should go away and just be determined dynamically;
+    // e.g., by setting an attribute on the "xul:menu" tag.
+    nsAutoString tagStr;
+    tag->ToString(tagStr);
+    if (tagStr.EqualsIgnoreCase("name")) {
+        // Hack to ensure that we add in a lowercase name attribute also.
+        aToolbarItemElement->SetAttribute(kNameSpaceID_None, kValueAtom, value, PR_TRUE);
+    }
+
+    return NS_OK;
+}
+
+nsresult
+RDFToolbarBuilderImpl::UnsetWidgetAttribute(nsIContent* aToolbarItemElement,
+                                            nsIRDFResource* aProperty,
+                                            nsIRDFNode* aValue)
+{
+    nsresult rv;
+
+    PRInt32 nameSpaceID;
+    nsCOMPtr<nsIAtom> tag;
+    rv = mDocument->SplitProperty(aProperty, &nameSpaceID, getter_AddRefs(tag));
+    if (NS_FAILED(rv)) return rv;
+
+    rv = aToolbarItemElement->UnsetAttribute(nameSpaceID, tag, PR_TRUE);
+    if (NS_FAILED(rv)) return rv;
+
+    // XXX This should go away and just be determined dynamically;
+    // e.g., by setting an attribute on the "xul:menu" tag.
+    nsAutoString tagStr;
+    tag->ToString(tagStr);
+    if (tagStr.EqualsIgnoreCase("name")) {
+        // Hack to ensure that we add in a lowercase name attribute also.
+        aToolbarItemElement->UnsetAttribute(kNameSpaceID_None, kValueAtom, PR_TRUE);
+    }
+
+    return NS_OK;
+}
+
+

mozilla/rdf/content/src/nsXULAttributes.cpp

@@ -0,0 +1,652 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+
+/*
+
+  A helper class used to implement attributes.
+
+*/
+
+
+/*
+ * Notes
+ *
+ * A lot of these methods delegate back to the original content node
+ * that created them. This is so that we can lazily produce attribute
+ * values from the RDF graph as they're asked for.
+ *
+ */
+
+#include "nsCOMPtr.h"
+#include "nsDOMCID.h"
+#include "nsIContent.h"
+#include "nsICSSParser.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMScriptObjectFactory.h"
+#include "nsINameSpaceManager.h"
+#include "nsIServiceManager.h"
+#include "nsIURL.h"
+#include "nsXULAttributes.h"
+#include "nsLayoutCID.h"
+
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+static NS_DEFINE_CID(kDOMScriptObjectFactoryCID, NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
+static NS_DEFINE_CID(kCSSParserCID, NS_CSSPARSER_CID);
+static NS_DEFINE_CID(kICSSParserIID, NS_ICSS_PARSER_IID);
+
+
+////////////////////////////////////////////////////////////////////////
+// nsXULAttribute
+
+nsXULAttribute::nsXULAttribute(nsIContent* aContent,
+                               PRInt32 aNameSpaceID,
+                               nsIAtom* aName,
+                               const nsString& aValue)
+    : mNameSpaceID(aNameSpaceID),
+      mName(aName),
+      mValue(aValue),
+      mContent(aContent),
+      mScriptObject(nsnull)
+{
+    NS_INIT_REFCNT();
+    NS_IF_ADDREF(aName);
+}
+
+nsXULAttribute::~nsXULAttribute()
+{
+    NS_IF_RELEASE(mName);
+}
+
+nsresult
+NS_NewXULAttribute(nsXULAttribute** aResult,
+                   nsIContent* aContent,
+                   PRInt32 aNameSpaceID,
+                   nsIAtom* aName,
+                   const nsString& aValue)
+{
+    NS_PRECONDITION(aResult != nsnull, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    if (! (*aResult = new nsXULAttribute(aContent, aNameSpaceID, aName, aValue)))
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(*aResult);
+    return NS_OK;
+}
+
+// nsISupports interface
+NS_IMPL_ADDREF(nsXULAttribute);
+NS_IMPL_RELEASE(nsXULAttribute);
+
+NS_IMETHODIMP
+nsXULAttribute::QueryInterface(REFNSIID aIID, void** aResult)
+{
+    NS_PRECONDITION(aResult != nsnull, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    if (aIID.Equals(nsIDOMAttr::GetIID()) ||
+        aIID.Equals(nsIDOMNode::GetIID()) ||
+        aIID.Equals(kISupportsIID)) {
+        *aResult = NS_STATIC_CAST(nsIDOMAttr*, this);
+        NS_ADDREF(this);
+        return NS_OK;
+    }
+    else if (aIID.Equals(nsIScriptObjectOwner::GetIID())) {
+        *aResult = NS_STATIC_CAST(nsIScriptObjectOwner*, this);
+        NS_ADDREF(this);
+        return NS_OK;
+    }
+    else {
+        *aResult = nsnull;
+        return NS_NOINTERFACE;
+    }
+}
+
+// nsIDOMNode interface
+
+NS_IMETHODIMP
+nsXULAttribute::GetNodeName(nsString& aNodeName)
+{
+    aNodeName.SetString(mName->GetUnicode());
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetNodeValue(nsString& aNodeValue)
+{
+    aNodeValue=mValue;
+    return NS_OK;
+}
+NS_IMETHODIMP
+nsXULAttribute::SetNodeValue(const nsString& aNodeValue)
+{
+    return SetValue(aNodeValue);
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetNodeType(PRUint16* aNodeType)
+{
+    *aNodeType = (PRUint16)nsIDOMNode::ATTRIBUTE_NODE;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetParentNode(nsIDOMNode** aParentNode)
+{
+    *aParentNode = nsnull;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetChildNodes(nsIDOMNodeList** aChildNodes)
+{
+    NS_NOTYETIMPLEMENTED("write me");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetFirstChild(nsIDOMNode** aFirstChild)
+{
+    NS_NOTYETIMPLEMENTED("write me");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetLastChild(nsIDOMNode** aLastChild)
+{
+    NS_NOTYETIMPLEMENTED("write me");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetPreviousSibling(nsIDOMNode** aPreviousSibling)
+{
+    *aPreviousSibling = nsnull;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetNextSibling(nsIDOMNode** aNextSibling)
+{
+    *aNextSibling = nsnull;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetAttributes(nsIDOMNamedNodeMap** aAttributes)
+{
+    *aAttributes = nsnull;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetOwnerDocument(nsIDOMDocument** aOwnerDocument)
+{
+    NS_NOTYETIMPLEMENTED("write me");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::InsertBefore(nsIDOMNode* aNewChild, nsIDOMNode* aRefChild, nsIDOMNode** aReturn)
+{
+    return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::ReplaceChild(nsIDOMNode* aNewChild, nsIDOMNode* aOldChild, nsIDOMNode** aReturn)
+{
+    return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::RemoveChild(nsIDOMNode* aOldChild, nsIDOMNode** aReturn)
+{
+    return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::AppendChild(nsIDOMNode* aNewChild, nsIDOMNode** aReturn)
+{
+    return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::HasChildNodes(PRBool* aReturn)
+{
+    NS_NOTYETIMPLEMENTED("write me");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::CloneNode(PRBool aDeep, nsIDOMNode** aReturn)
+{
+    NS_NOTYETIMPLEMENTED("write me");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+
+// nsIDOMAttr interface
+
+NS_IMETHODIMP
+nsXULAttribute::GetName(nsString& aName)
+{
+    aName.SetString(mName->GetUnicode());
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetSpecified(PRBool* aSpecified)
+{
+    // XXX this'll break when we make Clone() work
+    *aSpecified = PR_TRUE;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::GetValue(nsString& aValue)
+{
+    aValue=mValue;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttribute::SetValue(const nsString& aValue)
+{
+    nsCOMPtr<nsIDOMElement> element( do_QueryInterface(mContent) );
+    if (element) {
+        nsAutoString qualifiedName;
+        GetQualifiedName(qualifiedName);
+        return element->SetAttribute(qualifiedName, aValue);
+    }
+    else {
+        return NS_ERROR_FAILURE;
+    }
+}
+
+
+// nsIScriptObjectOwner interface
+
+NS_IMETHODIMP
+nsXULAttribute::GetScriptObject(nsIScriptContext* aContext, void** aScriptObject)
+{
+    nsresult rv = NS_OK;
+    if (! mScriptObject) {
+        nsIDOMScriptObjectFactory *factory;
+    
+        rv = nsServiceManager::GetService(kDOMScriptObjectFactoryCID,
+                                          nsIDOMScriptObjectFactory::GetIID(),
+                                          (nsISupports **)&factory);
+
+        if (NS_FAILED(rv))
+            return rv;
+
+        rv = factory->NewScriptAttr(aContext, 
+                                    (nsISupports*)(nsIDOMAttr*) this,
+                                    (nsISupports*) mContent,
+                                    (void**) &mScriptObject);
+
+        nsServiceManager::ReleaseService(kDOMScriptObjectFactoryCID, factory);
+    }
+
+    *aScriptObject = mScriptObject;
+    return rv;
+}
+
+
+NS_IMETHODIMP
+nsXULAttribute::SetScriptObject(void *aScriptObject)
+{
+    mScriptObject = aScriptObject;
+    return NS_OK;
+}
+
+
+// Implementation methods
+
+void
+nsXULAttribute::GetQualifiedName(nsString& aQualifiedName)
+{
+    aQualifiedName.Truncate();
+    if ((mNameSpaceID != kNameSpaceID_None) &&
+        (mNameSpaceID != kNameSpaceID_Unknown)) {
+        nsresult rv;
+
+        nsIAtom* prefix;
+        rv = mContent->GetNameSpacePrefixFromId(mNameSpaceID, prefix);
+
+        if (NS_SUCCEEDED(rv) && (prefix != nsnull)) {
+            aQualifiedName.Append(prefix->GetUnicode());
+            aQualifiedName.Append(':');
+            NS_RELEASE(prefix);
+        }
+    }
+    aQualifiedName.Append(mName->GetUnicode());
+}
+
+
+////////////////////////////////////////////////////////////////////////
+// nsXULAttributes
+
+nsXULAttributes::nsXULAttributes(nsIContent* aContent)
+    : mContent(aContent),
+      mClassList(nsnull),
+      mStyleRule(nsnull),
+      mScriptObject(nsnull)
+{
+    NS_INIT_REFCNT();
+}
+
+
+nsXULAttributes::~nsXULAttributes()
+{
+    PRInt32 count = mAttributes.Count();
+    PRInt32 index;
+    for (index = 0; index < count; index++) {
+        nsXULAttribute* attr = (nsXULAttribute*)mAttributes.ElementAt(index);
+        NS_RELEASE(attr);
+    }
+}
+
+
+nsresult
+NS_NewXULAttributes(nsXULAttributes** aResult, nsIContent* aContent)
+{
+    NS_PRECONDITION(aResult != nsnull, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    if (! (*aResult = new nsXULAttributes(aContent)))
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(*aResult);
+    return NS_OK;
+}
+
+
+// nsISupports interface
+
+NS_IMPL_ADDREF(nsXULAttributes);
+NS_IMPL_RELEASE(nsXULAttributes);
+
+NS_IMETHODIMP
+nsXULAttributes::QueryInterface(REFNSIID aIID, void** aResult)
+{
+    NS_PRECONDITION(aResult != nsnull, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    if (aIID.Equals(nsIDOMNamedNodeMap::GetIID()) ||
+        aIID.Equals(kISupportsIID)) {
+        *aResult = NS_STATIC_CAST(nsIDOMNamedNodeMap*, this);
+        NS_ADDREF(this);
+        return NS_OK;
+    }
+    else if (aIID.Equals(nsIScriptObjectOwner::GetIID())) {
+        *aResult = NS_STATIC_CAST(nsIScriptObjectOwner*, this);
+        NS_ADDREF(this);
+        return NS_OK;
+    }
+    else {
+        *aResult = nsnull;
+        return NS_NOINTERFACE;
+    }
+}
+
+
+// nsIDOMNamedNodeMap interface
+
+NS_IMETHODIMP
+nsXULAttributes::GetLength(PRUint32* aLength)
+{
+    NS_PRECONDITION(aLength != nsnull, "null ptr");
+    if (! aLength)
+        return NS_ERROR_NULL_POINTER;
+
+    *aLength = mAttributes.Count();
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttributes::GetNamedItem(const nsString& aName, nsIDOMNode** aReturn)
+{
+    NS_PRECONDITION(aReturn != nsnull, "null ptr");
+    if (! aReturn)
+        return NS_ERROR_NULL_POINTER;
+
+    nsresult rv;
+    *aReturn = nsnull;
+
+    PRInt32 nameSpaceID;
+    nsIAtom* name;
+
+    if (NS_FAILED(rv = mContent->ParseAttributeString(aName, name, nameSpaceID)))
+        return rv;
+
+    // XXX doing this instead of calling mContent->GetAttribute() will
+    // make it a lot harder to lazily instantiate properties from the
+    // graph. The problem is, how else do we get the named item?
+    for (PRInt32 i = mAttributes.Count() - 1; i >= 0; --i) {
+        nsXULAttribute* attr = (nsXULAttribute*) mAttributes[i];
+        if (((nameSpaceID == attr->mNameSpaceID) ||
+             (nameSpaceID == kNameSpaceID_Unknown) ||
+             (nameSpaceID == kNameSpaceID_None)) &&
+            (name == attr->mName)) {
+            NS_ADDREF(attr);
+            *aReturn = attr;
+            break;
+        }
+    }
+
+    NS_RELEASE(name);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULAttributes::SetNamedItem(nsIDOMNode* aArg, nsIDOMNode** aReturn)
+{
+    NS_NOTYETIMPLEMENTED("write me");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsXULAttributes::RemoveNamedItem(const nsString& aName, nsIDOMNode** aReturn)
+{
+    nsCOMPtr<nsIDOMElement> element( do_QueryInterface(mContent) );
+    if (element) {
+        return element->RemoveAttribute(aName);
+        *aReturn = nsnull; // XXX should be the element we just removed
+        return NS_OK;
+    }
+    else {
+        return NS_ERROR_FAILURE;
+    }
+}
+
+NS_IMETHODIMP
+nsXULAttributes::Item(PRUint32 aIndex, nsIDOMNode** aReturn)
+{
+    *aReturn = (nsXULAttribute*) mAttributes[aIndex];
+    NS_IF_ADDREF(*aReturn);
+    return NS_OK;
+}
+
+
+
+
+// nsIScriptObjectOwner interface
+
+NS_IMETHODIMP
+nsXULAttributes::GetScriptObject(nsIScriptContext* aContext, void** aScriptObject)
+{
+    nsresult rv = NS_OK;
+    if (! mScriptObject) {
+        nsIDOMScriptObjectFactory *factory;
+    
+        rv = nsServiceManager::GetService(kDOMScriptObjectFactoryCID,
+                                          nsIDOMScriptObjectFactory::GetIID(),
+                                          (nsISupports **)&factory);
+
+        if (NS_FAILED(rv))
+            return rv;
+
+        rv = factory->NewScriptNamedNodeMap(aContext, 
+                                            (nsISupports*)(nsIDOMNamedNodeMap*) this, 
+                                            (nsISupports*) mContent,
+                                            (void**) &mScriptObject);
+
+        nsServiceManager::ReleaseService(kDOMScriptObjectFactoryCID, factory);
+    }
+
+    *aScriptObject = mScriptObject;
+    return rv;
+}
+
+NS_IMETHODIMP
+nsXULAttributes::SetScriptObject(void *aScriptObject)
+{
+    mScriptObject = aScriptObject;
+    return NS_OK;
+}
+
+// Implementation methods
+
+nsresult 
+nsXULAttributes::GetClasses(nsVoidArray& aArray) const
+{
+  aArray.Clear();
+  const nsClassList* classList = mClassList;
+  while (nsnull != classList) {
+    aArray.AppendElement(classList->mAtom); // NOTE atom is not addrefed
+    classList = classList->mNext;
+  }
+  return NS_OK;
+}
+
+nsresult 
+nsXULAttributes::HasClass(nsIAtom* aClass) const
+{
+  const nsClassList* classList = mClassList;
+  while (nsnull != classList) {
+    if (classList->mAtom == aClass) {
+      return NS_OK;
+    }
+    classList = classList->mNext;
+  }
+  return NS_COMFALSE;
+}
+
+nsresult nsXULAttributes::UpdateClassList(const nsString& aValue)
+{
+  if (mClassList != nsnull)
+  {
+    delete mClassList;
+    mClassList = nsnull;
+  }
+
+  if (aValue != "")
+    ParseClasses(aValue, &mClassList);
+  
+  return NS_OK;
+}
+
+nsresult nsXULAttributes::UpdateStyleRule(nsIURL* aDocURL, const nsString& aValue)
+{
+    if (aValue == "")
+    {
+      // XXX: Removing the rule. Is this sufficient?
+      NS_IF_RELEASE(mStyleRule);
+      mStyleRule = nsnull;
+      return NS_OK;
+    }
+
+    nsICSSParser* css;
+    nsresult result = nsComponentManager::CreateInstance(kCSSParserCID,
+                                                         nsnull,
+                                                         kICSSParserIID,
+                                                         (void**)&css);
+    if (NS_OK != result) {
+      return result;
+    }
+
+    nsIStyleRule* rule;
+    result = css->ParseDeclarations(aValue, aDocURL, rule);
+    //NS_IF_RELEASE(docURL);
+    
+    if ((NS_OK == result) && (nsnull != rule)) {
+      mStyleRule = rule; //Addrefed already during parse, so don't need to addref again.
+      //result = SetHTMLAttribute(aAttribute, nsHTMLValue(rule), aNotify);
+    }
+    //else {
+    //  result = SetHTMLAttribute(aAttribute, nsHTMLValue(aValue), aNotify);
+    //}
+    NS_RELEASE(css);
+    return NS_OK;
+}
+
+nsresult nsXULAttributes::GetInlineStyleRule(nsIStyleRule*& aRule)
+{
+  nsresult result = NS_ERROR_NULL_POINTER;
+  if (mStyleRule != nsnull)
+  {
+    aRule = mStyleRule;
+    NS_ADDREF(aRule);
+    result = NS_OK;
+  }
+
+  return result;
+}
+
+
+void
+nsXULAttributes::ParseClasses(const nsString& aClassString, nsClassList** aClassList)
+{
+static const PRUnichar kNullCh = PRUnichar('\0');
+
+  NS_ASSERTION(nsnull == *aClassList, "non null start list");
+
+  nsAutoString  classStr(aClassString);  // copy to work buffer
+  classStr.Append(kNullCh);  // put an extra null at the end
+
+  PRUnichar* start = (PRUnichar*)(const PRUnichar*)classStr.GetUnicode();
+  PRUnichar* end   = start;
+
+  while (kNullCh != *start) {
+    while ((kNullCh != *start) && nsString::IsSpace(*start)) {  // skip leading space
+      start++;
+    }
+    end = start;
+
+    while ((kNullCh != *end) && (PR_FALSE == nsString::IsSpace(*end))) { // look for space or end
+      end++;
+    }
+    *end = kNullCh; // end string here
+
+    if (start < end) {
+      *aClassList = new nsClassList(NS_NewAtom(start));
+      aClassList = &((*aClassList)->mNext);
+    }
+
+    start = ++end;
+  }
+}
+

mozilla/rdf/content/src/nsXULAttributes.h

@@ -0,0 +1,180 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+
+/*
+
+  A set of helper classes used to implement attributes.
+
+*/
+
+#ifndef nsXULAttributes_h__
+#define nsXULAttributes_h__
+
+#include "nsIDOMAttr.h"
+#include "nsIDOMNamedNodeMap.h"
+#include "nsIScriptObjectOwner.h"
+#include "nsIStyleRule.h"
+#include "nsString.h"
+#include "nsIAtom.h"
+#include "nsVoidArray.h"
+
+class nsIURL;
+
+struct nsClassList {
+  nsClassList(nsIAtom* aAtom)
+    : mAtom(aAtom),
+      mNext(nsnull)
+  {
+  }
+  nsClassList(const nsClassList& aCopy)
+    : mAtom(aCopy.mAtom),
+      mNext(nsnull)
+  {
+    NS_ADDREF(mAtom);
+    if (nsnull != aCopy.mNext) {
+      mNext = new nsClassList(*(aCopy.mNext));
+    }
+  }
+  ~nsClassList(void)
+  {
+    NS_RELEASE(mAtom);
+    if (nsnull != mNext) {
+      delete mNext;
+    }
+  }
+
+  nsIAtom*      mAtom;
+  nsClassList*  mNext;
+};
+
+////////////////////////////////////////////////////////////////////////
+
+class nsXULAttribute : public nsIDOMAttr,
+                       public nsIScriptObjectOwner
+{
+private:
+    nsXULAttribute(nsIContent* aContent,
+                   PRInt32 aNameSpaceID,
+                   nsIAtom* aName,
+                   const nsString& aValue);
+
+    virtual ~nsXULAttribute();
+
+    friend nsresult
+    NS_NewXULAttribute(nsXULAttribute** aResult,
+                       nsIContent* aContent,
+                       PRInt32 aNameSpaceID,
+                       nsIAtom* aName,
+                       const nsString& aValue);
+
+public:
+
+    // nsISupports interface
+    NS_DECL_ISUPPORTS
+
+    // nsIDOMNode interface
+    NS_DECL_IDOMNODE
+
+    // nsIDOMAttr interface
+    NS_DECL_IDOMATTR
+
+    // nsIScriptObjectOwner interface
+    NS_IMETHOD GetScriptObject(nsIScriptContext* aContext, void** aScriptObject);
+    NS_IMETHOD SetScriptObject(void *aScriptObject);
+
+    // Implementation methods
+    void GetQualifiedName(nsString& aAttributeName);
+
+    PRInt32 GetNameSpaceID();
+    nsIAtom* GetName();
+    const nsString& GetValue();
+
+    // Publicly exposed to make life easier. This is a private class
+    // anyway.
+    PRInt32     mNameSpaceID;
+    nsIAtom*    mName;
+    nsString    mValue;
+
+private:
+    nsIContent* mContent;
+    void*       mScriptObject;
+};
+
+nsresult
+NS_NewXULAttribute(nsXULAttribute** aResult,
+                   nsIContent* aContent,
+                   PRInt32 aNameSpaceID,
+                   nsIAtom* aName,
+                   const nsString& aValue);
+
+////////////////////////////////////////////////////////////////////////
+
+class nsXULAttributes : public nsIDOMNamedNodeMap,
+                        public nsIScriptObjectOwner
+{
+public:
+    // nsISupports interface
+    NS_DECL_ISUPPORTS
+
+    // nsIDOMNamedNodeMap interface
+    NS_DECL_IDOMNAMEDNODEMAP
+
+    // nsIScriptObjectOwner interface
+    NS_IMETHOD GetScriptObject(nsIScriptContext* aContext, void** aScriptObject);
+    NS_IMETHOD SetScriptObject(void *aScriptObject);
+
+    // Implementation methods
+    // VoidArray Helpers
+    PRInt32 Count() { return mAttributes.Count(); };
+    nsXULAttribute* ElementAt(PRInt32 i) { return (nsXULAttribute*)mAttributes.ElementAt(i); };
+    void AppendElement(nsXULAttribute* aElement) { mAttributes.AppendElement((void*)aElement); };
+    void RemoveElementAt(PRInt32 aIndex) { mAttributes.RemoveElementAt(aIndex); };
+
+    // Style Helpers
+    nsresult GetClasses(nsVoidArray& aArray) const;
+    nsresult HasClass(nsIAtom* aClass) const;
+
+    nsresult UpdateClassList(const nsString& aValue);
+    nsresult UpdateStyleRule(nsIURL* aDocURL, const nsString& aValue);
+    nsresult GetInlineStyleRule(nsIStyleRule*& aRule);
+
+private:
+    friend nsresult
+    NS_NewXULAttributes(nsXULAttributes** aResult, nsIContent* aContent);
+
+    nsXULAttributes(nsIContent* aContent);
+    virtual ~nsXULAttributes();
+
+    static void
+    ParseClasses(const nsString& aClassString, nsClassList** aClassList);
+
+    nsIContent*   mContent;
+    nsClassList*  mClassList;
+    nsIStyleRule* mStyleRule;
+    nsVoidArray   mAttributes;
+    void*         mScriptObject;
+};
+
+
+nsresult
+NS_NewXULAttributes(nsXULAttributes** aResult, nsIContent* aContent);
+
+#endif // nsXULAttributes_h__
+

mozilla/rdf/content/src/nsXULDocumentInfo.cpp

@@ -0,0 +1,120 @@
+/* -*- 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 file provides the implementation for the sort service manager.
+ */
+
+
+#include "nsIXULDocumentInfo.h"
+#include "nsIDocument.h"
+#include "nsIRDFResource.h"
+#include "nsRDFCID.h"
+
+////////////////////////////////////////////////////////////////////////
+
+static NS_DEFINE_IID(kXULDocumentInfoCID,      NS_XULDOCUMENTINFO_CID);
+static NS_DEFINE_IID(kIXULDocumentInfoIID,     NS_IXULDOCUMENTINFO_IID);
+static NS_DEFINE_IID(kISupportsIID,            NS_ISUPPORTS_IID);
+
+
+////////////////////////////////////////////////////////////////////////
+// DocumentInfoImpl
+//
+//   This is the document info object passed to the doc loader
+//
+class XULDocumentInfoImpl : public nsIXULDocumentInfo
+{
+public:
+    XULDocumentInfoImpl(void);
+    virtual ~XULDocumentInfoImpl(void);
+    
+    // nsISupports
+    NS_DECL_ISUPPORTS
+
+    // nsIDocumentInfo
+    NS_IMETHOD Init(nsIDocument* aDocument, nsIRDFResource* aResource);
+    NS_IMETHOD GetDocument(nsIDocument** aDocument);
+    NS_IMETHOD GetResource(nsIRDFResource** aResource);
+
+private:
+    nsIDocument* mParentDocument;
+    nsIRDFResource* mFragmentRoot;
+};
+
+
+////////////////////////////////////////////////////////////////////////
+
+XULDocumentInfoImpl::XULDocumentInfoImpl(void)
+:mParentDocument(nsnull), mFragmentRoot(nsnull)
+{
+	NS_INIT_REFCNT();
+}
+
+
+XULDocumentInfoImpl::~XULDocumentInfoImpl(void)
+{
+  NS_IF_RELEASE(mParentDocument);
+  NS_IF_RELEASE(mFragmentRoot);
+}
+
+nsresult
+XULDocumentInfoImpl::Init(nsIDocument* aDocument, nsIRDFResource* aResource) {
+  NS_IF_RELEASE(mParentDocument);
+  NS_IF_RELEASE(mFragmentRoot);
+
+  mParentDocument = aDocument;
+  mFragmentRoot = aResource;
+
+  NS_IF_ADDREF(mParentDocument);
+  NS_IF_ADDREF(mFragmentRoot);
+
+  return NS_OK;
+}
+
+nsresult
+XULDocumentInfoImpl::GetDocument(nsIDocument** aDocument) {
+  NS_IF_ADDREF(mParentDocument);
+  *aDocument = mParentDocument;
+  return NS_OK;
+}
+
+nsresult
+XULDocumentInfoImpl::GetResource(nsIRDFResource** aResource) {
+  NS_IF_ADDREF(mFragmentRoot);
+  *aResource = mFragmentRoot;
+  return NS_OK;
+}
+
+NS_IMPL_ADDREF(XULDocumentInfoImpl);
+NS_IMPL_RELEASE(XULDocumentInfoImpl);
+
+NS_IMPL_QUERY_INTERFACE(XULDocumentInfoImpl, kIXULDocumentInfoIID);
+
+////////////////////////////////////////////////////////////////////////
+
+
+nsresult
+NS_NewXULDocumentInfo(nsIXULDocumentInfo** aResult)
+{
+  XULDocumentInfoImpl* info = new XULDocumentInfoImpl();
+  NS_ADDREF(info);
+  *aResult = info;
+  return NS_OK;
+}
+

mozilla/rdf/content/src/nsXULElement.h

@@ -0,0 +1,71 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+#ifndef nsXULElement_h__
+#define nsXULElement_h__
+
+#include "nsIDOMXULElement.h"
+class nsXULElement : public nsISupports
+{
+protected:
+    nsIDOMXULElement* mOuter;
+    nsXULElement(nsIDOMXULElement* aOuter) : mOuter(aOuter) {}
+    
+public:
+    virtual ~nsXULElement() {};
+
+    // nsISupports interface. Subclasses should use the
+    // NS_DECL/IMPL_ISUPPORTS_INHERITED macros to implement the
+    // nsISupports interface.
+    NS_IMETHOD_(nsrefcnt) AddRef() {
+        return mOuter->AddRef();
+    }
+
+    NS_IMETHOD_(nsrefcnt) Release() {
+        return mOuter->Release();
+    }
+
+    NS_IMETHOD QueryInterface(REFNSIID aIID, void** aResult) {
+        return mOuter->QueryInterface(aIID, aResult);
+    }
+};
+
+#define NS_IMPL_XULELEMENT_ISUPPORTS                            \
+    NS_IMETHOD_(nsrefcnt) AddRef() {                            \
+        return mOuter->AddRef();                                \
+    }                                                           \
+                                                                \
+    NS_IMETHOD_(nsrefcnt) Release() {                           \
+        return mOuter->Release();                               \
+    }                                                           \
+                                                                \
+    NS_IMETHOD QueryInterface(REFNSIID aIID, void** aResult) {  \
+        if (aIID.Equals(GetDOMIID())) {                         \
+            *aResult = this;                                    \
+            NS_ADDREF(this);                                    \
+            return NS_OK;                                       \
+        }                                                       \
+        else {                                                  \
+            return mOuter->QueryInterface(aIID, aResult);       \
+        }                                                       \
+    }
+
+
+
+#endif // nsXULElement_h__

mozilla/rdf/content/src/nsXULPopupListener.cpp

@@ -0,0 +1,323 @@
+/* -*- 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 file provides the implementation for the sort service manager.
+ */
+
+#include "nsCOMPtr.h"
+#include "nsIDOMElement.h"
+#include "nsIXULPopupListener.h"
+#include "nsIDOMMouseListener.h"
+#include "nsIDOMFocusListener.h"
+#include "nsRDFCID.h"
+
+#include "nsIScriptGlobalObject.h"
+#include "nsIDOMWindow.h"
+#include "nsIScriptContextOwner.h"
+#include "nsIDOMXULDocument.h"
+#include "nsIDocument.h"
+#include "nsIContent.h"
+#include "nsIDOMUIEvent.h"
+
+////////////////////////////////////////////////////////////////////////
+
+static NS_DEFINE_IID(kXULPopupListenerCID,      NS_XULPOPUPLISTENER_CID);
+static NS_DEFINE_IID(kIXULPopupListenerIID,     NS_IXULPOPUPLISTENER_IID);
+static NS_DEFINE_IID(kISupportsIID,           NS_ISUPPORTS_IID);
+
+static NS_DEFINE_IID(kIDomNodeIID,            NS_IDOMNODE_IID);
+static NS_DEFINE_IID(kIDomElementIID,         NS_IDOMELEMENT_IID);
+static NS_DEFINE_IID(kIDomEventListenerIID,   NS_IDOMEVENTLISTENER_IID);
+
+////////////////////////////////////////////////////////////////////////
+// PopupListenerImpl
+//
+//   This is the popup listener implementation for popup menus, context menus,
+//   and tooltips.
+//
+class XULPopupListenerImpl : public nsIXULPopupListener,
+                             public nsIDOMMouseListener,
+                             public nsIDOMFocusListener
+{
+public:
+    XULPopupListenerImpl(void);
+    virtual ~XULPopupListenerImpl(void);
+
+public:
+    // nsISupports
+    NS_DECL_ISUPPORTS
+
+    // nsIXULPopupListener
+    NS_IMETHOD Init(nsIDOMElement* aElement, const XULPopupType& popupType);
+
+    // nsIDOMMouseListener
+    virtual nsresult MouseDown(nsIDOMEvent* aMouseEvent);
+    virtual nsresult MouseUp(nsIDOMEvent* aMouseEvent) { return NS_OK; };
+    virtual nsresult MouseClick(nsIDOMEvent* aMouseEvent) { return NS_OK; };
+    virtual nsresult MouseDblClick(nsIDOMEvent* aMouseEvent) { return NS_OK; };
+    virtual nsresult MouseOver(nsIDOMEvent* aMouseEvent) { return NS_OK; };
+    virtual nsresult MouseOut(nsIDOMEvent* aMouseEvent) { return NS_OK; };
+
+    // nsIDOMFocusListener
+    virtual nsresult Focus(nsIDOMEvent* aEvent) { return NS_OK; };
+    virtual nsresult Blur(nsIDOMEvent* aEvent);
+
+    // nsIDOMEventListener
+    virtual nsresult HandleEvent(nsIDOMEvent* anEvent) { return NS_OK; };
+
+protected:
+    virtual nsresult LaunchPopup(nsIDOMEvent* anEvent);
+
+private:
+    nsIDOMElement* element; // Weak reference. The element will go away first.
+    XULPopupType popupType;
+};
+
+////////////////////////////////////////////////////////////////////////
+
+XULPopupListenerImpl::XULPopupListenerImpl(void)
+{
+	NS_INIT_REFCNT();
+	
+}
+
+XULPopupListenerImpl::~XULPopupListenerImpl(void)
+{
+}
+
+NS_IMPL_ADDREF(XULPopupListenerImpl)
+NS_IMPL_RELEASE(XULPopupListenerImpl)
+
+NS_IMETHODIMP
+XULPopupListenerImpl::QueryInterface(REFNSIID iid, void** result)
+{
+    if (! result)
+        return NS_ERROR_NULL_POINTER;
+
+    *result = nsnull;
+    if (iid.Equals(nsIXULPopupListener::GetIID())) {
+        *result = NS_STATIC_CAST(nsIXULPopupListener*, this);
+        NS_ADDREF_THIS();
+        return NS_OK;
+    }
+    else if (iid.Equals(nsIDOMMouseListener::GetIID())) {
+        *result = NS_STATIC_CAST(nsIDOMMouseListener*, this);
+        NS_ADDREF_THIS();
+        return NS_OK;
+    }
+    else if (iid.Equals(nsIDOMFocusListener::GetIID())) {
+        *result = NS_STATIC_CAST(nsIDOMMouseListener*, this);
+        NS_ADDREF_THIS();
+        return NS_OK;
+    }
+    else if (iid.Equals(kIDomEventListenerIID)) {
+        *result = (nsIDOMEventListener*)(nsIDOMMouseListener*)this;
+        NS_ADDREF_THIS();
+        return NS_OK;
+    }
+
+    return NS_NOINTERFACE;
+}
+
+NS_IMETHODIMP
+XULPopupListenerImpl::Init(nsIDOMElement* aElement, const XULPopupType& popup)
+{
+  element = aElement; // Weak reference. Don't addref it.
+  popupType = popup;
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////
+// nsIDOMMouseListener
+
+nsresult
+XULPopupListenerImpl::MouseDown(nsIDOMEvent* aMouseEvent)
+{
+  PRUint32 button;
+
+  nsCOMPtr<nsIDOMUIEvent>uiEvent;
+  uiEvent = do_QueryInterface(aMouseEvent);
+  if (!uiEvent) {
+    //non-ui event passed in.  bad things.
+    return NS_OK;
+  }
+
+  switch (popupType) {
+    case eXULPopupType_popup:
+      // Check for left mouse button down
+      uiEvent->GetButton(&button);
+      if (button == 1) {
+        // Time to launch a popup menu.
+        LaunchPopup(aMouseEvent);
+      }
+      break;
+    case eXULPopupType_context:
+      // Check for right mouse button down
+      uiEvent->GetButton(&button);
+      // XXX: Handle Mac 
+      if (button == 3) {
+        // Time to launch a context menu.
+        LaunchPopup(aMouseEvent);
+      }
+      break;
+  }
+  return NS_OK;
+}
+
+nsresult
+XULPopupListenerImpl::LaunchPopup(nsIDOMEvent* anEvent)
+{
+  nsresult rv = NS_OK;
+
+  nsString type("popup");
+  if (eXULPopupType_context == popupType)
+    type = "context";
+
+  nsString identifier;
+  element->GetAttribute(type, identifier);
+
+  if (identifier == "")
+    return rv;
+
+  // Try to find the popup content.
+  nsCOMPtr<nsIDocument> document;
+  nsCOMPtr<nsIContent> content = do_QueryInterface(element);
+  if (NS_FAILED(rv = content->GetDocument(*getter_AddRefs(document)))) {
+    NS_ERROR("Unable to retrieve the document.");
+    return rv;
+  }
+
+  // Turn the document into a XUL document so we can use getElementById
+  nsCOMPtr<nsIDOMXULDocument> xulDocument = do_QueryInterface(document);
+  if (xulDocument == nsnull) {
+    NS_ERROR("Popup attached to an element that isn't in XUL!");
+    return NS_ERROR_FAILURE;
+  }
+
+  // XXX Handle the _child case for popups and context menus!
+
+  // Use getElementById to obtain the popup content.
+  nsCOMPtr<nsIDOMElement> popupContent;
+  if (NS_FAILED(rv = xulDocument->GetElementById(identifier, getter_AddRefs(popupContent)))) {
+    NS_ERROR("GetElementById had some kind of spasm.");
+    return rv;
+  }
+
+  if (popupContent == nsnull) {
+    // Gracefully fail in this case.
+    return NS_OK;
+  }
+
+  // We have some popup content. Obtain our window.
+  nsIScriptContextOwner* owner = document->GetScriptContextOwner();
+  nsCOMPtr<nsIScriptContext> context;
+  if (NS_OK == owner->GetScriptContext(getter_AddRefs(context))) {
+    nsIScriptGlobalObject* global = context->GetGlobalObject();
+    if (global) {
+      // Get the DOM window
+      nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(global);
+      if (domWindow != nsnull) {
+        // Find out if we're anchored.
+        nsString anchorAlignment;
+        element->GetAttribute("popupanchor", anchorAlignment);
+
+        nsString popupAlignment("topleft");
+        element->GetAttribute("popupalign", popupAlignment);
+
+		    // Set the popup in the document for the duration of this call.
+		    xulDocument->SetPopup(element);
+        if (anchorAlignment == "") {
+          // We aren't anchored. Create on the point.
+          // Retrieve our x and y position.
+          nsCOMPtr<nsIDOMUIEvent>uiEvent;
+          uiEvent = do_QueryInterface(anEvent);
+          if (!uiEvent) {
+            //non-ui event passed in.  bad things.
+            return NS_OK;
+          }
+
+          PRInt32 xPos;
+    		  PRInt32 yPos;
+          uiEvent->GetScreenX(&xPos); 
+          uiEvent->GetScreenY(&yPos); 
+          xPos = 50; // For now, hardcode to (50,50), since screen doesn't work.
+          yPos = 50;
+                 
+          domWindow->CreatePopup(element, popupContent, 
+                               xPos, yPos, 
+                               type, popupAlignment);
+        }
+        else {
+          // We're anchored. Pass off to the window, and let it figure out
+          // from the frame where it wants to put us.
+          domWindow->CreateAnchoredPopup(element, popupContent,
+                                         anchorAlignment, type, popupAlignment);
+        }
+		    xulDocument->SetPopup(nsnull);
+      }
+      NS_RELEASE(global);
+    }
+  }
+  NS_IF_RELEASE(owner);
+
+  return NS_OK;
+}
+
+nsresult
+XULPopupListenerImpl::Blur(nsIDOMEvent* aMouseEvent)
+{
+  nsresult rv = NS_OK;
+
+  // Try to find the popup content.
+  nsCOMPtr<nsIDocument> document;
+  nsCOMPtr<nsIContent> content = do_QueryInterface(element);
+  if (NS_FAILED(rv = content->GetDocument(*getter_AddRefs(document)))) {
+    NS_ERROR("Unable to retrieve the document.");
+    return rv;
+  }
+
+  // Blur events don't bubble, so this means our window lost focus.
+  // Close up, baby.
+  // We have some popup content. Obtain our window.
+  nsIScriptContextOwner* owner = document->GetScriptContextOwner();
+  nsCOMPtr<nsIScriptContext> context;
+  if (NS_OK == owner->GetScriptContext(getter_AddRefs(context))) {
+    nsIScriptGlobalObject* global = context->GetGlobalObject();
+    if (global) {
+      // Get the DOM window
+      nsCOMPtr<nsIDOMWindow> domWindow = do_QueryInterface(global);
+      domWindow->Close();
+    }
+  }
+
+  return rv;
+}
+
+////////////////////////////////////////////////////////////////
+nsresult
+NS_NewXULPopupListener(nsIXULPopupListener** pop)
+{
+    XULPopupListenerImpl* popup = new XULPopupListenerImpl();
+    if (!popup)
+      return NS_ERROR_OUT_OF_MEMORY;
+    
+    NS_ADDREF(popup);
+    *pop = popup;
+    return NS_OK;
+}

mozilla/rdf/content/src/nsXULTreeElement.cpp

@@ -0,0 +1,55 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+#include "nsCOMPtr.h"
+#include "nsIRDFCompositeDataSource.h"
+#include "nsIServiceManager.h"
+#include "nsRDFCID.h"
+#include "nsXULTreeElement.h"
+
+NS_IMPL_ISUPPORTS_INHERITED(nsXULTreeElement, nsXULElement, nsIDOMXULTreeElement);
+
+NS_IMETHODIMP
+nsXULTreeElement::GetDatabase(nsIRDFCompositeDataSource** aDatabase)
+{
+    NS_PRECONDITION(aDatabase != nsnull, "null ptr");
+    if (! aDatabase)
+        return NS_ERROR_NULL_POINTER;
+
+    NS_IF_ADDREF(mDatabase);
+    *aDatabase = mDatabase;
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP
+nsXULTreeElement::SetDatabase(nsIRDFCompositeDataSource* aDatabase)
+{
+    // XXX maybe someday you'll be allowed to change it.
+    NS_PRECONDITION(mDatabase == nsnull, "already initialized");
+    if (mDatabase)
+        return NS_ERROR_ALREADY_INITIALIZED;
+
+    mDatabase = aDatabase;
+    NS_IF_ADDREF(aDatabase);
+
+    // XXX reconstruct the entire tree now!
+
+    return NS_OK;
+}

mozilla/rdf/content/src/nsXULTreeElement.h

@@ -0,0 +1,60 @@
+/* -*- 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 "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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
+ */
+
+#ifndef nsXULTreeElement_h__
+#define nsXULTreeElement_h__
+
+#include "nsXULElement.h"
+#include "nsIDOMXULTreeElement.h"
+#include "nsIRDFCompositeDataSource.h"
+
+class nsXULTreeElement : public nsXULElement,
+                         public nsIDOMXULTreeElement
+{
+private:
+    nsIRDFCompositeDataSource* mDatabase;
+
+public:
+    nsXULTreeElement(nsIDOMXULElement* aOuter)
+        : nsXULElement(aOuter),
+          mDatabase(nsnull)
+    {
+    }
+
+    NS_DECL_ISUPPORTS_INHERITED
+
+    // nsIDOMNode interface
+    NS_FORWARD_IDOMNODE(mOuter->);
+
+    // nsIDOMElement interface
+    NS_FORWARD_IDOMELEMENT(mOuter->);
+
+    // nsIDOMXULElement interface
+    NS_FORWARD_IDOMXULELEMENT(mOuter->);
+
+    // nsIDOMXULTreeElement interface
+    NS_DECL_IDOMXULTREEELEMENT
+
+    virtual const nsIID& GetDOMIID() {
+        return nsIDOMXULTreeElement::GetIID();
+    }
+};
+
+
+#endif // nsXULTreeElement_h__

mozilla/webtools/bugzilla/Attachment.pm

@@ -1,97 +0,0 @@
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-#
-# 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 the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-#                 Myk Melez <myk@mozilla.org>
-
-############################################################################
-# Module Initialization
-############################################################################
-
-use diagnostics;
-use strict;
-
-package Attachment;
-
-# This module requires that its caller have said "require CGI.pl" to import
-# relevant functions from that script and its companion globals.pl.
-
-############################################################################
-# Functions
-############################################################################
-
-sub query
-{
-  # Retrieves and returns an array of attachment records for a given bug. 
-  # This data should be given to attachment/list.atml in an
-  # "attachments" variable.
-  my ($bugid) = @_;
-
-  my $in_editbugs = &::UserInGroup($::userid, "editbugs");
-
-  # Retrieve a list of attachments for this bug and write them into an array
-  # of hashes in which each hash represents a single attachment.
-  &::SendSQL("
-              SELECT attach_id, creation_ts, mimetype, description, ispatch, 
-               isobsolete, submitter_id 
-              FROM attachments WHERE bug_id = $bugid ORDER BY attach_id
-            ");
-  my @attachments = ();
-  while (&::MoreSQLData()) {
-    my %a;
-    my $submitter_id;
-    ($a{'attachid'}, $a{'date'}, $a{'contenttype'}, $a{'description'},
-     $a{'ispatch'}, $a{'isobsolete'}, $submitter_id) = &::FetchSQLData();
-
-    # Format the attachment's creation/modification date into a standard
-    # format (YYYY-MM-DD HH:MM)
-    if ($a{'date'} =~ /^(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) {
-        $a{'date'} = "$1-$2-$3 $4:$5";
-    }
-
-    # Retrieve a list of status flags that have been set on the attachment.
-    &::PushGlobalSQLState();
-    &::SendSQL(" 
-                SELECT   name 
-                FROM     attachstatuses, attachstatusdefs 
-                WHERE    attach_id = $a{'attachid'} 
-                AND      attachstatuses.statusid = attachstatusdefs.id
-                ORDER BY sortkey
-              ");
-    my @statuses = ();
-    while (&::MoreSQLData()) { 
-      my ($status) = &::FetchSQLData(); 
-      push @statuses , $status;
-    }
-    $a{'statuses'} = \@statuses;
-    &::PopGlobalSQLState();
-
-    # We will display the edit link if the user can edit the attachment;
-    # ie the are the submitter, or they have canedit.
-    # Also show the link if the user is not logged in - in that cae,
-    # They'll be prompted later
-    $a{'canedit'} = ($::userid == 0 || $submitter_id == $::userid ||
-                     $in_editbugs);
-    push @attachments, \%a;
-  }
-  
-  return \@attachments;  
-}
-
-1;

mozilla/webtools/bugzilla/Bug.pm

@@ -1,525 +0,0 @@
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-#
-# 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 the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Dawn Endico    <endico@mozilla.org>
-#                 Terry Weissman <terry@mozilla.org>
-#                 Chris Yeh      <cyeh@bluemartini.com>
-
-use diagnostics;
-use strict;
-
-use DBI;
-use RelationSet;
-use vars qw($unconfirmedstate $legal_keywords);
-require "globals.pl";
-require "CGI.pl";
-package Bug;
-use CGI::Carp qw(fatalsToBrowser);
-my %ok_field;
-
-for my $key (qw (bug_id product version rep_platform op_sys bug_status 
-                resolution priority bug_severity component assigned_to
-                reporter bug_file_loc short_desc target_milestone 
-                qa_contact status_whiteboard creation_ts 
-                delta_ts votes whoid comment query error) ){
-    $ok_field{$key}++;
-    }
-
-# create a new empty bug
-#
-sub new {
-  my $type = shift();
-  my %bug;
-
-  # create a ref to an empty hash and bless it
-  #
-  my $self = {%bug};
-  bless $self, $type;
-
-  # construct from a hash containing a bug's info
-  #
-  if ($#_ == 1) {
-    $self->initBug(@_);
-  } else {
-    confess("invalid number of arguments \($#_\)($_)");
-  }
-
-  # bless as a Bug
-  #
-  return $self;
-}
-
-
-
-# dump info about bug into hash unless user doesn't have permission
-# user_id 0 is used when person is not logged in.
-#
-sub initBug  {
-  my $self = shift();
-  my ($bug_id, $user_id) = (@_);
-
-  my $old_bug_id = $bug_id;
-  if ((! defined $bug_id) || (!$bug_id) || (!&::detaint_natural($bug_id))) {
-      # no bug number given
-      $self->{'bug_id'} = $old_bug_id;
-      $self->{'error'} = "InvalidBugId";
-      return $self;
-  }
-
-# default userid 0, or get DBID if you used an email address
-  unless (defined $user_id) {
-    $user_id = 0;
-  }
-  else {
-     if ($user_id =~ /^\@/) {
-        $user_id = &::DBname_to_id($user_id); 
-     }
-  }
-     
-
-  &::ConnectToDatabase();
-  &::GetVersionTable();
-
-  # this verification should already have been done by caller
-  # my $loginok = quietly_check_login();
-
-
-  $self->{'whoid'} = $user_id;
-
-  # First check that we can see it
-  if (!&::CanSeeBug($bug_id, $user_id)) {
-      # is it not there, or are we just forbidden to see it?
-      &::SendSQL("SELECT bug_id FROM bugs WHERE bug_id = $bug_id");
-      if (&::FetchSQLData()) {
-          $self->{'error'} = "NotPermitted";
-      } else {
-          $self->{'error'} = "NotFound";
-      }
-      $self->{'bug_id'} = $bug_id;
-      return $self;
-  }
-
-    my $query = "";
-    if ($::driver eq 'mysql') {
-        $query = "
-    select
-      bugs.bug_id, product, version, rep_platform, op_sys, bug_status,
-      resolution, priority, bug_severity, component, assigned_to, reporter,
-      bug_file_loc, short_desc, target_milestone, qa_contact,
-      status_whiteboard, date_format(creation_ts,'%Y-%m-%d %H:%i'),
-      delta_ts, sum(votes.count)
-    from bugs left join votes using(bug_id)
-    where bugs.bug_id = $bug_id
-    group by bugs.bug_id";
-    } elsif ($::driver eq 'Pg') {
-        $query = "
-    select
-      bugs.bug_id, product, version, rep_platform, op_sys, bug_status,
-      resolution, priority, bug_severity, component, assigned_to, reporter,
-      bug_file_loc, short_desc, target_milestone, qa_contact,
-      status_whiteboard, creation_ts,
-      delta_ts, sum(votes.count)
-    from bugs left join votes using(bug_id)
-    where bugs.bug_id = $bug_id
-    group by bugs.bug_id, product, version, rep_platform, op_sys, bug_status,
-         resolution, priority, bug_severity, component, assigned_to, reporter,
-         bug_file_loc, short_desc, target_milestone, qa_contact, status_whiteboard,
-         creation_ts, delta_ts";
-    }
-
-  &::SendSQL($query);
-  my @row;
-
-  @row = &::FetchSQLData();
-  my $count = 0;
-  my %fields;
-  foreach my $field ("bug_id", "product", "version", "rep_platform",
-                     "op_sys", "bug_status", "resolution", "priority",
-                     "bug_severity", "component", "assigned_to", "reporter",
-                     "bug_file_loc", "short_desc", "target_milestone",
-                     "qa_contact", "status_whiteboard", "creation_ts",
-                     "delta_ts", "votes") {
-      $fields{$field} = shift @row;
-      if ($fields{$field}) {
-          $self->{$field} = $fields{$field};
-      }
-      $count++;
-  }
-
-  $self->{'assigned_to'} = &::DBID_to_name($self->{'assigned_to'});
-  $self->{'reporter'} = &::DBID_to_name($self->{'reporter'});
-
-  my $ccSet = new RelationSet;
-  $ccSet->mergeFromDB("select who from cc where bug_id=$bug_id");
-  my @cc = $ccSet->toArrayOfStrings();
-  if (@cc) {
-    $self->{'cc'} = \@cc;
-  }
-
-  if (&::Param("useqacontact") && (defined $self->{'qa_contact'}) ) {
-    my $name = $self->{'qa_contact'} > 0 ? &::DBID_to_name($self->{'qa_contact'}) :"";
-    if ($name) {
-      $self->{'qa_contact'} = $name;
-    }
-  }
-
-  if (@::legal_keywords) {
-    &::SendSQL("SELECT keyworddefs.name 
-              FROM keyworddefs, keywords
-             WHERE keywords.bug_id = $bug_id 
-               AND keyworddefs.id = keywords.keywordid
-          ORDER BY keyworddefs.name");
-    my @list;
-    while (&::MoreSQLData()) {
-        push(@list, &::FetchOneColumn());
-    }
-    if (@list) {
-      $self->{'keywords'} = join(', ', @list);
-    }
-  }
-
-  &::SendSQL("select attach_id, creation_ts, description 
-           from attachments 
-           where bug_id = $bug_id");
-  my @attachments;
-  while (&::MoreSQLData()) {
-    my ($attachid, $date, $desc) = (&::FetchSQLData());
-    if ($date =~ /^(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) {
-        $date = "$3/$4/$2 $5:$6";
-      my %attach;
-      $attach{'attachid'} = $attachid;
-      $attach{'date'} = $date;
-      $attach{'desc'} = $desc;
-      push @attachments, \%attach;
-    }
-  }
-  if (@attachments) {
-    $self->{'attachments'} = \@attachments;
-  }
-
-  &::SendSQL("select bug_id, who, bug_when, thetext 
-           from longdescs 
-           where bug_id = $bug_id");
-  my @longdescs;
-  while (&::MoreSQLData()) {
-    my ($bug_id, $who, $bug_when, $thetext) = (&::FetchSQLData());
-    my %longdesc;
-    $longdesc{'who'} = $who;
-    $longdesc{'bug_when'} = $bug_when;
-    $longdesc{'thetext'} = $thetext;
-    push @longdescs, \%longdesc;
-  }
-  if (@longdescs) {
-    $self->{'longdescs'} = \@longdescs;
-  }
-
-  if (&::Param("usedependencies")) {
-    my @depends = EmitDependList("blocked", "dependson", $bug_id);
-    if ( @depends ) {
-      $self->{'dependson'} = \@depends;
-    }
-    my @blocks = EmitDependList("dependson", "blocked", $bug_id);
-    if ( @blocks ) {
-      $self->{'blocks'} = \@blocks;
-    }
-  }
-
-  return $self;
-}
-
-
-
-# given a bug hash, emit xml for it. with file header provided by caller
-#
-sub emitXML {
-  ( $#_ == 0 ) || confess("invalid number of arguments");
-  my $self = shift();
-  my $xml;
-
-
-  if (exists $self->{'error'}) {
-    $xml .= "<bug error=\"$self->{'error'}\">\n";
-    $xml .= "  <bug_id>$self->{'bug_id'}</bug_id>\n";
-    $xml .= "</bug>\n";
-    return $xml;
-  }
-
-  $xml .= "<bug>\n";
-
-  foreach my $field ("bug_id", "bug_status", "product",
-      "priority", "version", "rep_platform", "assigned_to", "delta_ts", 
-      "component", "reporter", "target_milestone", "bug_severity", 
-      "creation_ts", "qa_contact", "op_sys", "resolution", "bug_file_loc",
-      "short_desc", "keywords", "status_whiteboard") {
-    if ($self->{$field}) {
-      $xml .= "  <$field>" . QuoteXMLChars($self->{$field}) . "</$field>\n";
-    }
-  }
-
-  foreach my $field ("dependson", "blocks", "cc") {
-    if (defined $self->{$field}) {
-      for (my $i=0 ; $i < @{$self->{$field}} ; $i++) {
-        $xml .= "  <$field>" . $self->{$field}[$i] . "</$field>\n";
-      }
-    }
-  }
-
-  if (defined $self->{'longdescs'}) {
-    for (my $i=0 ; $i < @{$self->{'longdescs'}} ; $i++) {
-      $xml .= "  <long_desc>\n"; 
-      $xml .= "   <who>" . &::DBID_to_name($self->{'longdescs'}[$i]->{'who'}) 
-                         . "</who>\n"; 
-      $xml .= "   <bug_when>" . $self->{'longdescs'}[$i]->{'bug_when'} 
-                              . "</bug_when>\n"; 
-      $xml .= "   <thetext>" . QuoteXMLChars($self->{'longdescs'}[$i]->{'thetext'})
-                             . "</thetext>\n"; 
-      $xml .= "  </long_desc>\n"; 
-    }
-  }
-
-  if (defined $self->{'attachments'}) {
-    for (my $i=0 ; $i < @{$self->{'attachments'}} ; $i++) {
-      $xml .= "  <attachment>\n"; 
-      $xml .= "    <attachid>" . $self->{'attachments'}[$i]->{'attachid'}
-                              . "</attachid>\n"; 
-      $xml .= "    <date>" . $self->{'attachments'}[$i]->{'date'} . "</date>\n"; 
-      $xml .= "    <desc>" . QuoteXMLChars($self->{'attachments'}[$i]->{'desc'}) . "</desc>\n"; 
-    # $xml .= "    <type>" . $self->{'attachments'}[$i]->{'type'} . "</type>\n"; 
-    # $xml .= "    <data>" . $self->{'attachments'}[$i]->{'data'} . "</data>\n"; 
-      $xml .= "  </attachment>\n"; 
-    }
-  }
-
-  $xml .= "</bug>\n";
-  return $xml;
-}
-
-sub EmitDependList {
-  my ($myfield, $targetfield, $bug_id) = (@_);
-  my @list;
-  &::SendSQL("select dependencies.$targetfield, bugs.bug_status
-           from dependencies, bugs
-           where dependencies.$myfield = $bug_id
-             and bugs.bug_id = dependencies.$targetfield
-           order by dependencies.$targetfield");
-  while (&::MoreSQLData()) {
-    my ($i, $stat) = (&::FetchSQLData());
-    push @list, $i;
-  }
-  return @list;
-}
-
-sub QuoteXMLChars {
-  $_[0] =~ s/&/&amp;/g;
-  $_[0] =~ s/</&lt;/g;
-  $_[0] =~ s/>/&gt;/g;
-  $_[0] =~ s/'/&apos;/g;
-  $_[0] =~ s/"/&quot;/g;
-# $_[0] =~ s/([\x80-\xFF])/&XmlUtf8Encode(ord($1))/ge;
-  return($_[0]);
-}
-
-sub XML_Header {
-  my ($urlbase, $version, $maintainer, $exporter) = (@_);
-
-  my $xml;
-  $xml = "<?xml version=\"1.0\" standalone=\"yes\"?>\n";
-  $xml .= "<!DOCTYPE bugzilla SYSTEM \"$urlbase";
-  if (! ($urlbase =~ /.+\/$/)) {
-    $xml .= "/";
-  }
-  $xml .= "bugzilla.dtd\">\n";
-  $xml .= "<bugzilla";
-  if (defined $exporter) {
-    $xml .= " exporter=\"$exporter\"";
-  }
-  $xml .= " version=\"$version\"";
-  $xml .= " urlbase=\"$urlbase\"";
-  $xml .= " maintainer=\"$maintainer\">\n";
-  return ($xml);
-}
-
-
-sub XML_Footer {
-  return ("</bugzilla>\n");
-}
-
-sub UserInGroup {
-    my $self = shift();
-    my ($groupname) = (@_);
-    return &::UserInGroup($self->{'whoid'}, $groupname);
-}
-
-sub CanChangeField {
-   my $self = shift();
-   my ($f, $oldvalue, $newvalue) = (@_);
-   my $UserInEditGroup = -1;
-   my $UserInCanConfirmGroup = -1;
-   my $ownerid;
-   my $reporterid;
-   my $qacontactid;
-
-    if ($f eq "assigned_to" || $f eq "reporter" || $f eq "qa_contact") {
-        if ($oldvalue =~ /^\d+$/) {
-            if ($oldvalue == 0) {
-                $oldvalue = "";
-            } else {
-                $oldvalue = &::DBID_to_name($oldvalue);
-            }
-        }
-    }
-    if ($oldvalue eq $newvalue) {
-        return 1;
-    }
-    if (&::trim($oldvalue) eq &::trim($newvalue)) {
-        return 1;
-    }
-    if ($f =~ /^longdesc/) {
-        return 1;
-    }
-    if ($UserInEditGroup < 0) {
-        $UserInEditGroup = UserInGroup($self, "editbugs");
-    }
-    if ($UserInEditGroup) {
-        return 1;
-    }
-    &::SendSQL("SELECT reporter, assigned_to, qa_contact FROM bugs " .
-                "WHERE bug_id = $self->{'bug_id'}");
-    ($reporterid, $ownerid, $qacontactid) = (&::FetchSQLData());
-
-    # Let reporter change bug status, even if they can't edit bugs.
-    # If reporter can't re-open their bug they will just file a duplicate.
-    # While we're at it, let them close their own bugs as well.
-    if ( ($f eq "bug_status") && ($self->{'whoid'} eq $reporterid) ) {
-        return 1;
-    }
-    if ($f eq "bug_status" && $newvalue ne $::unconfirmedstate &&
-        &::IsOpenedState($newvalue)) {
-
-        # Hmm.  They are trying to set this bug to some opened state
-        # that isn't the UNCONFIRMED state.  Are they in the right
-        # group?  Or, has it ever been confirmed?  If not, then this
-        # isn't legal.
-
-        if ($UserInCanConfirmGroup < 0) {
-            $UserInCanConfirmGroup = &::UserInGroup($self->{'whoid'},"canconfirm");
-        }
-        if ($UserInCanConfirmGroup) {
-            return 1;
-        }
-        &::SendSQL("SELECT everconfirmed FROM bugs WHERE bug_id = $self->{'bug_id'}");
-        my $everconfirmed = FetchOneColumn();
-        if ($everconfirmed) {
-            return 1;
-        }
-    } elsif ($reporterid eq $self->{'whoid'} || $ownerid eq $self->{'whoid'} ||
-             $qacontactid eq $self->{'whoid'}) {
-        return 1;
-    }
-    $self->{'error'} = "
-Only the owner or submitter of the bug, or a sufficiently
-empowered user, may make that change to the $f field."
-}
-
-sub Collision {
-    my $self = shift();
-    my $write = "WRITE";        # Might want to make a param to control
-                                # whether we do LOW_PRIORITY ...
-    if ($::driver eq 'mysql') {
-        &::SendSQL("LOCK TABLES bugs $write, bugs_activity $write, cc $write, " .
-                "cc AS selectVisible_cc $write, " .
-                "profiles $write, dependencies $write, votes $write, " .
-                "keywords $write, longdescs $write, fielddefs $write, " .
-                "keyworddefs READ, groups READ, attachments READ, products READ");
-    } 
-    &::SendSQL("SELECT delta_ts FROM bugs where bug_id=$self->{'bug_id'}");
-    my $delta_ts = &::FetchOneColumn();
-    if ($::driver eq 'mysql') {
-        &::SendSQL("unlock tables");
-    }
-    if ($self->{'delta_ts'} ne $delta_ts) {
-       return 1;
-    }
-    else {
-       return 0;
-    }
-}
-
-sub AppendComment  {
-    my $self = shift();
-    my ($comment) = (@_);
-    $comment =~ s/\r\n/\n/g;     # Get rid of windows-style line endings.
-    $comment =~ s/\r/\n/g;       # Get rid of mac-style line endings.
-    if ($comment =~ /^\s*$/) {  # Nothin' but whitespace.
-        return;
-    }
-
-    &::SendSQL("INSERT INTO longdescs (bug_id, who, bug_when, thetext) " .
-            "VALUES($self->{'bug_id'}, $self->{'whoid'}, now(), " . &::SqlQuote($comment) . ")");
-
-    &::SendSQL("UPDATE bugs SET delta_ts = now() WHERE bug_id = $self->{'bug_id'}");
-}
-
-
-#from o'reilley's Programming Perl
-sub display {
-    my $self = shift;
-    my @keys;
-    if (@_ == 0) {                  # no further arguments
-        @keys = sort keys(%$self);
-    }  else {
-        @keys = @_;                 # use the ones given
-    }
-    foreach my $key (@keys) {
-        print "\t$key => $self->{$key}\n";
-    }
-}
-
-sub CommitChanges {
-
-#snapshot bug
-#snapshot dependencies
-#check can change fields
-#check collision
-#lock and change fields
-#notify through mail
-
-}
-
-sub AUTOLOAD {
-  use vars qw($AUTOLOAD);
-  my $self = shift;
-  my $type = ref($self) || $self;
-  my $attr = $AUTOLOAD;
-
-  $attr =~ s/.*:://;
-  return unless $attr=~ /[^A-Z]/;
-  if (@_) {
-    $self->{$attr} = shift;
-    return;
-  }
-  confess ("invalid bug attribute $attr") unless $ok_field{$attr};
-  if (defined $self->{$attr}) {
-    return $self->{$attr};
-  } else {
-    return '';
-  }
-}
-
-1;

mozilla/webtools/bugzilla/README

@@ -1,16 +0,0 @@
-* This README is no longer used to house installation instructions.  Instead,
-it contains pointers to where you may find the information you need.
-
-* Installation instructions are now found in docs/, with a variety of document
-types available.  Please refer to these documents when installing, configuring,
-and maintaining your Bugzilla installation.  A helpful starting point is
-docs/txt/Bugzilla-Guide.txt, or with a web browser at docs/html/index.html.
-
-* Release notes for people upgrading to a new version of Bugzilla are
-available at docs/rel_notes.txt.
-
-* If you wish to contribute to the documentation, please read docs/README.docs.
-
-* The Bugzilla web site is at "http://www.mozilla.org/projects/bugzilla/".
-This site will contain the latest Bugzilla information, including how to
-report bugs and how to get help with Bugzilla.

mozilla/webtools/bugzilla/RelationSet.pm

@@ -1,268 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Bugzilla Bug Tracking System.
-# 
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s): Dan Mosedale <dmose@mozilla.org>
-#                 Terry Weissman <terry@mozilla.org>
-#                 Dave Miller <justdave@syndicomm.com>
-
-# This object models a set of relations between one item and a group
-# of other items.  An example is the set of relations between one bug
-# and the users CCed on that bug.  Currently, the relation objects are
-# expected to be bugzilla userids.  However, this could and perhaps
-# should be generalized to work with non userid objects, such as
-# keywords associated with a bug.  That shouldn't be hard to do; it
-# might involve turning this into a virtual base class, and having
-# UserSet and KeywordSet types that inherit from it.
-
-use diagnostics;
-use strict;
-
-# Everything that uses RelationSet should already have globals.pl loaded
-# so we don't want to load it here.  Doing so causes a loop in Perl because
-# globals.pl turns around and does a 'use RelationSet'
-# See http://bugzilla.mozilla.org/show_bug.cgi?id=72862
-#require "globals.pl";
-
-package RelationSet;
-use CGI::Carp qw(fatalsToBrowser);
-
-# create a new empty RelationSet
-#
-sub new {
-  my $type = shift();
-
-  # create a ref to an empty hash and bless it
-  #
-  my $self = {};
-  bless $self, $type;
-
-  # construct from a comma-delimited string
-  # 
-  if ($#_ == 0) {
-    $self->mergeFromString($_[0]);
-  }
-  # unless this was a constructor for an empty list, somebody screwed up.
-  #
-  elsif ( $#_ != -1 ) {
-    confess("invalid number of arguments");
-  }
-
-  # bless as a RelationSet
-  #
-  return $self;
-}
-
-# Assumes that the set of relations "FROM $table WHERE $constantSql and 
-# $column = $value" is currently represented by $self, and this set should
-# be updated to look like $other.  
-#
-# Returns an array of two strings, one INSERT and one DELETE, which will
-# make this change.  Either or both strings may be the empty string,
-# meaning that no INSERT or DELETE or both (respectively) need to be done.
-#
-# THE CALLER IS RESPONSIBLE FOR ANY DESIRED LOCKING AND/OR CONSISTENCY 
-# CHECKS (not to mention doing the SendSQL() calls).
-#
-sub generateSqlDeltas {
-  ($#_ == 5) || confess("invalid number of arguments");
-  my ( $self, # instance ptr to set representing the existing state
-       $endState, # instance ptr to set representing the desired state
-       $table, # table where these relations are kept
-       $invariantName, # column held const for a RelationSet (often "bug_id")
-       $invariantValue, # what to hold the above column constant at
-       $columnName # the column which varies (often a userid)
-     ) = @_;
-
-  # construct the insert list by finding relations which exist in the
-  # end state but not the current state.
-  #
-  my @endStateRelations = keys(%$endState);
-  my @insertList = ();
-  foreach ( @endStateRelations ) {
-    push ( @insertList, $_ ) if ( ! exists $$self{"$_"} );
-  }
-
-  # we've built the list.  If it's non-null, add required sql chrome.
-  #
-  my $sqlInsert="";
-  if ( $#insertList > -1 ) {
-    $sqlInsert = "INSERT INTO $table ($invariantName, $columnName) VALUES " .
-      join (",", 
-            map ( "($invariantValue, $_)" , @insertList ) 
-           );
-  }
-     
-  # construct the delete list by seeing which relations exist in the
-  # current state but not the end state
-  #
-  my @selfRelations = keys(%$self);
-  my @deleteList = ();
-  foreach ( @selfRelations ) {
-    push (@deleteList, $_) if ( ! exists $$endState{"$_"} );
-  }
-
-  # we've built the list.  if it's non-empty, add required sql chrome.
-  #
-  my $sqlDelete = "";
-  if ( $#deleteList > -1 ) {
-    $sqlDelete = "DELETE FROM $table WHERE $invariantName = $invariantValue " .
-      "AND $columnName IN ( " . join (",", @deleteList) . " )";
-  } 
-
-  return ($sqlInsert, $sqlDelete);
-}
-
-# compare the current object with another.  
-#
-sub isEqual {
-  ($#_ == 1) || confess("invalid number of arguments");
-  my $self = shift();
-  my $other = shift();
-
-  # get arrays of the keys for faster processing
-  #
-  my @selfRelations = keys(%$self);
-  my @otherRelations = keys(%$other);
- 
-  # make sure the arrays are the same size
-  #
-  return 0 if ( $#selfRelations != $#otherRelations );
-
-  # bail out if any of the elements are different
-  #
-  foreach my $relation ( @selfRelations ) {
-    return 0 if ( !exists $$other{$relation})
-  }
-
-  # we made it!
-  #
-  return 1;
-
-}
-
-# merge the results of a SQL command into this set
-#
-sub mergeFromDB {
-  ( $#_ == 1 ) || confess("invalid number of arguments");
-  my $self = shift();
-
-  &::SendSQL(shift());
-  while (my @row = &::FetchSQLData()) {
-    $$self{$row[0]} = 1;
-  }
-
-  return;
-}
-
-# merge a set in string form into this set
-#
-sub mergeFromString {
-  ($#_ == 1) || confess("invalid number of arguments");
-  my $self = shift();
-
-  # do the merge
-  #
-  foreach my $person (split(/[ ,]/, shift())) {
-    if ($person ne "") {
-      $$self{&::DBNameToIdAndCheck($person)} = 1;
-    }
-  }
-}
-
-# remove a set in string form from this set
-#
-sub removeItemsInString {
-  ($#_ == 1) || confess("invalid number of arguments");
-  my $self = shift();
-
-  # do the merge
-  #
-  foreach my $person (split(/[ ,]/, shift())) {
-    if ($person ne "") {
-      my $dbid = &::DBNameToIdAndCheck($person);
-      if (exists $$self{$dbid}) {
-        delete $$self{$dbid};
-      }
-    }
-  }
-}
-
-# remove a set in array form from this set
-#
-sub removeItemsInArray {
-  ($#_ > 0) || confess("invalid number of arguments");
-  my $self = shift();
-
-  # do the merge
-  #
-  while (my $person = shift()) {
-    if ($person ne "") {
-      my $dbid = &::DBNameToIdAndCheck($person);
-      if (exists $$self{$dbid}) {
-        delete $$self{$dbid};
-      }
-    }
-  }
-}
-
-# return the number of elements in this set
-#
-sub size {
-  my $self = shift();
-
-  my @k = keys(%$self);
-  return $#k++;
-}
-
-# return this set in array form
-#
-sub toArray {
-  my $self= shift();
-
-  return keys(%$self);
-}
-
-# return this set as an array of strings
-#
-sub toArrayOfStrings {
-  ($#_ == 0) || confess("invalid number of arguments");
-  my $self = shift();
-
-  my @result = ();
-  foreach my $i ( keys %$self ) {
-    push @result, &::DBID_to_name($i);
-  }
-
-  return sort { lc($a) cmp lc($b) } @result;
-}  
-
-# return this set in string form (comma-separated and sorted)
-#
-sub toString {
-  ($#_ == 0) || confess("invalid number of arguments");
-  my $self = shift();
-
-  my @result = ();
-  foreach my $i ( keys %$self ) {
-    push @result, &::DBID_to_name($i);
-  }
-
-  return join(',', sort(@result));
-}  
-
-1;

mozilla/webtools/bugzilla/Token.pm

@@ -1,273 +0,0 @@
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-#
-# 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 the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s):    Myk Melez <myk@mozilla.org>
-
-################################################################################
-# Module Initialization
-################################################################################
-
-# Make it harder for us to do dangerous things in Perl.
-use diagnostics;
-use strict;
-
-# Bundle the functions in this file together into the "Token" package.
-package Token;
-
-use Date::Format;
-
-# This module requires that its caller have said "require CGI.pl" to import
-# relevant functions from that script and its companion globals.pl.
-
-################################################################################
-# Constants
-################################################################################
-
-# The maximum number of days a token will remain valid.
-my $maxtokenage = 3;
-
-################################################################################
-# Functions
-################################################################################
-
-sub IssueEmailChangeToken {
-    my ($userid, $old_email, $new_email) = @_;
-
-    my $token_ts = time();
-    my $issuedate = time2str("%Y-%m-%d %H:%M", $token_ts);
-
-    # Generate a unique token and insert it into the tokens table.
-    # We have to lock the tokens table before generating the token, 
-    # since the database must be queried for token uniqueness.
-    &::SendSQL("LOCK TABLES tokens WRITE");
-    my $token = GenerateUniqueToken();
-    my $quotedtoken = &::SqlQuote($token);
-    my $quoted_emails = &::SqlQuote($old_email . ":" . $new_email);
-    &::SendSQL("INSERT INTO tokens ( userid , issuedate , token , 
-                                     tokentype , eventdata )
-                VALUES             ( $userid , '$issuedate' , $quotedtoken , 
-                                     'emailold' , $quoted_emails )");
-    my $newtoken = GenerateUniqueToken();
-    $quotedtoken = &::SqlQuote($newtoken);
-    &::SendSQL("INSERT INTO tokens ( userid , issuedate , token , 
-                                     tokentype , eventdata )
-                VALUES             ( $userid , '$issuedate' , $quotedtoken , 
-                                     'emailnew' , $quoted_emails )");
-    &::SendSQL("UNLOCK TABLES");
-
-    # Mail the user the token along with instructions for using it.
-
-    my $template = $::template;
-    my $vars = $::vars;
-
-    $vars->{'oldemailaddress'} = $old_email . &::Param('emailsuffix');
-    $vars->{'newemailaddress'} = $new_email . &::Param('emailsuffix');
-    
-    $vars->{'max_token_age'} = $maxtokenage;
-    $vars->{'token_ts'} = $token_ts;
-
-    $vars->{'token'} = $token;
-    $vars->{'emailaddress'} = $old_email . &::Param('emailsuffix');
-
-    my $message;
-    $template->process("account/email/change-old.txt.tmpl", $vars, \$message)
-      || &::ThrowTemplateError($template->error());
-
-    open SENDMAIL, "|/usr/lib/sendmail -t -i";
-    print SENDMAIL $message;
-    close SENDMAIL;
-
-    $vars->{'token'} = $newtoken;
-    $vars->{'emailaddress'} = $new_email . &::Param('emailsuffix');
-
-    $message = "";
-    $template->process("account/email/change-new.txt.tmpl", $vars, \$message)
-      || &::ThrowTemplateError($template->error());
-
-    open SENDMAIL, "|/usr/lib/sendmail -t -i";
-    print SENDMAIL $message;
-    close SENDMAIL;
-
-}
-
-sub IssuePasswordToken {
-    # Generates a random token, adds it to the tokens table, and sends it
-    # to the user with instructions for using it to change their password.
-
-    my ($loginname) = @_;
-
-    # Retrieve the user's ID from the database.
-    my $quotedloginname = &::SqlQuote($loginname);
-    &::SendSQL("SELECT userid FROM profiles WHERE login_name = $quotedloginname");
-    my ($userid) = &::FetchSQLData();
-
-    my $token_ts = time();
-    my $issuedate = time2str("%Y-%m-%d %H:%M", $token_ts);
-
-    # Generate a unique token and insert it into the tokens table.
-    # We have to lock the tokens table before generating the token, 
-    # since the database must be queried for token uniqueness.
-    &::SendSQL("LOCK TABLE tokens WRITE") if $::driver eq 'mysql';
-    my $token = GenerateUniqueToken();
-    my $quotedtoken = &::SqlQuote($token);
-    my $quotedipaddr = &::SqlQuote($::ENV{'REMOTE_ADDR'});
-    &::SendSQL("INSERT INTO tokens ( userid , issuedate , token , tokentype , eventdata )
-                VALUES      ( $userid , '$issuedate' , $quotedtoken , 'password' , $quotedipaddr )");
-    &::SendSQL("UNLOCK TABLES") if $::driver eq 'mysql';
-
-    # Mail the user the token along with instructions for using it.
-    
-    my $template = $::template;
-    my $vars = $::vars;
-
-    $vars->{'token'} = $token;
-    $vars->{'emailaddress'} = $loginname . &::Param('emailsuffix');
-
-    $vars->{'max_token_age'} = $maxtokenage;
-    $vars->{'token_ts'} = $token_ts;
-
-    my $message = "";
-    $template->process("account/password/forgotten-password.txt.tmpl", 
-                                                               $vars, \$message)
-      || &::ThrowTemplateError($template->error());
-
-    open SENDMAIL, "|/usr/lib/sendmail -t -i";
-    print SENDMAIL $message;
-    close SENDMAIL;
-
-}
-
-
-sub CleanTokenTable {
-    &::SendSQL("LOCK TABLES tokens WRITE") if $::driver eq 'mysql';
-    if ($::driver eq 'mysql') {
-        &::SendSQL("DELETE FROM tokens WHERE TO_DAYS(NOW()) - TO_DAYS(issuedate) >= " . $maxtokenage);
-    } elsif ($::driver eq 'Pg') {
-        &::SendSQL("DELETE FROM tokens WHERE now() - issuedate >= '$maxtokenage days'");
-    }
-    &::SendSQL("UNLOCK TABLES") if $::driver eq 'mysql';
-}
-
-
-sub GenerateUniqueToken {
-    # Generates a unique random token.  Uses &GenerateRandomPassword 
-    # for the tokens themselves and checks uniqueness by searching for
-    # the token in the "tokens" table.  Gives up if it can't come up
-    # with a token after about one hundred tries.
-
-    my $token;
-    my $duplicate = 1;
-    my $tries = 0;
-    while ($duplicate) {
-
-        ++$tries;
-        if ($tries > 100) {
-            &::DisplayError("Something is seriously wrong with the token generation system.");
-            exit;
-        }
-
-        $token = &::GenerateRandomPassword();
-        &::SendSQL("SELECT userid FROM tokens WHERE token = " . &::SqlQuote($token));
-        $duplicate = &::FetchSQLData();
-    }
-
-    return $token;
-
-}
-
-
-sub Cancel {
-    # Cancels a previously issued token and notifies the system administrator.
-    # This should only happen when the user accidentally makes a token request
-    # or when a malicious hacker makes a token request on behalf of a user.
-    
-    my ($token, $cancelaction) = @_;
-
-    # Quote the token for inclusion in SQL statements.
-    my $quotedtoken = &::SqlQuote($token);
-    
-    # Get information about the token being cancelled.
-    &::SendSQL("SELECT  issuedate , tokentype , eventdata , login_name , realname
-                FROM    tokens, profiles 
-                WHERE   tokens.userid = profiles.userid
-                AND     token = $quotedtoken");
-    my ($issuedate, $tokentype, $eventdata, $loginname, $realname) = &::FetchSQLData();
-
-    # Get the email address of the Bugzilla maintainer.
-    my $maintainer = &::Param('maintainer');
-
-    # Format the user's real name and email address into a single string.
-    my $username = $realname ? $realname . " <" . $loginname . ">" : $loginname;
-
-    my $template = $::template;
-    my $vars = $::vars;
-
-    $vars->{'emailaddress'} = $username;
-    $vars->{'maintainer'} = $maintainer;
-    $vars->{'remoteaddress'} = $::ENV{'REMOTE_ADDR'};
-    $vars->{'token'} = $token;
-    $vars->{'tokentype'} = $tokentype;
-    $vars->{'issuedate'} = $issuedate;
-    $vars->{'eventdata'} = $eventdata;
-    $vars->{'cancelaction'} = $cancelaction;
-
-    # Notify the user via email about the cancellation.
-
-    my $message;
-    $template->process("account/cancel-token.txt.tmpl", $vars, \$message)
-      || &::ThrowTemplateError($template->error());
-
-    open SENDMAIL, "|/usr/lib/sendmail -t -i";
-    print SENDMAIL $message;
-    close SENDMAIL;
-
-    # Delete the token from the database.
-    &::SendSQL("LOCK TABLE tokens WRITE") if $::driver eq 'mysql';
-    &::SendSQL("DELETE FROM tokens WHERE token = $quotedtoken");
-    &::SendSQL("UNLOCK TABLES") if $::driver eq 'mysql';
-}
-
-sub HasPasswordToken {
-    # Returns a password token if the user has one.
-    
-    my ($userid) = @_;
-    
-    &::SendSQL("SELECT token FROM tokens 
-                WHERE userid = $userid AND tokentype = 'password' LIMIT 1");
-    my ($token) = &::FetchSQLData();
-    
-    return $token;
-}
-
-sub HasEmailChangeToken {
-    # Returns an email change token if the user has one. 
-    
-    my ($userid) = @_;
-    
-    &::SendSQL("SELECT token FROM tokens 
-                 WHERE userid = $userid 
-                   AND tokentype = 'emailnew' 
-                    OR tokentype = 'emailold' LIMIT 1");
-    my ($token) = &::FetchSQLData();
-    
-    return $token;
-}
-
-
-1;

mozilla/webtools/bugzilla/UPGRADING

@@ -1,3 +0,0 @@
-Please consult The Bugzilla Guide for instructions on how to upgrade
-Bugzilla from an older version.  The Guide can be found with this
-distribution, in docs/html, docs/txt, and docs/sgml.

mozilla/webtools/bugzilla/UPGRADING-pre-2.8

@@ -1,407 +0,0 @@
-This file contains only important changes made to Bugzilla before release
-2.8.  If you are upgrading from version older than 2.8, please read this file.
-If you are upgrading from 2.8 or newer, please read the Installation and
-Upgrade instructions in The Bugzilla Guide, found with this distribution in
-docs/html, docs/txt, and docs/sgml.
-
-For a complete list of what changes, use Bonsai
-(http://cvs-mirror.mozilla.org/webtools/bonsai/cvsqueryform.cgi) to
-query the CVS tree.  For example,
-
-    http://cvs-mirror.mozilla.org/webtools/bonsai/cvsquery.cgi?module=all&branch=HEAD&branchtype=match&dir=mozilla%2Fwebtools%2Fbugzilla&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot 
-
-will tell you what has been changed in the last week.
-
-
-10/12/99 The CHANGES file is now obsolete!  There is a new file called
-checksetup.pl.  You should get in the habit of running that file every time
-you update your installation of Bugzilla.  That file will be constantly 
-updated to automatically update your installation to match any code changes.
-If you're curious as to what is going on, changes are commented in that file, 
-at the end.
-
-Many thanks to Holger Schurig <holgerschurig@nikocity.de> for writing this
-script!
-
-
-
-10/11/99 Restructured voting database to add a cached value in each
-bug recording how many total votes that bug has.  While I'm at it, I
-removed the unused "area" field from the bugs database.  It is
-distressing to realize that the bugs table has reached the maximum
-number of indices allowed by MySQL (16), which may make future
-enhancements awkward.
-
-You must feed the following to MySQL:
-
-	alter table bugs drop column area;
-	alter table bugs add column votes mediumint not null, add index (votes);
-
-You then *must* delete the data/versioncache file when you make this
-change, as it contains references to the "area" field.  Deleting it is safe,
-bugzilla will correctly regenerate it.
-
-If you have been using the voting feature at all, then you will then
-need to update the voting cache.  You can do this by visiting the
-sanitycheck.cgi page, and taking it up on its offer to rebuild the
-votes stuff.
-
-
-10/7/99 Added voting ability.  You must run the new script
-"makevotestable.sh".  You must also feed the following to mysql:
-
-	alter table products add column votesperuser smallint not null;
-
-
-
-9/15/99 Apparently, newer alphas of MySQL won't allow you to have
-"when" as a column name.  So, I have had to rename a column in the
-bugs_activity table.  You must feed the below to mysql or you won't
-work at all.
-
-	alter table bugs_activity change column when bug_when datetime not null;
-
-
-8/16/99 Added "OpenVMS" to the list of OS's. Feed this to mysql:
-
-	alter table bugs change column op_sys op_sys enum("All", "Windows 3.1", "Windows 95", "Windows 98", "Windows NT", "Mac System 7", "Mac System 7.5", "Mac System 7.6.1", "Mac System 8.0", "Mac System 8.5", "Mac System 8.6", "AIX", "BSDI", "HP-UX", "IRIX", "Linux", "FreeBSD", "OSF/1", "Solaris", "SunOS", "Neutrino", "OS/2", "BeOS", "OpenVMS", "other") not null;
-
-6/22/99 Added an entry to the attachments table to record who the submitter
-was.  Nothing uses this yet, but it still should be recorded.
-
-	alter table attachments add column submitter_id mediumint not null;
-
-You should also run this script to populate the new field:
-
-#!/usr/bonsaitools/bin/perl -w
-use diagnostics;
-use strict;
-require "globals.pl";
-$|=1;
-ConnectToDatabase();
-SendSQL("select bug_id, attach_id from attachments order by bug_id");
-my @list;
-while (MoreSQLData()) {
-    my @row = FetchSQLData();
-    push(@list, \@row);
-}
-foreach my $ref (@list) {
-    my ($bug, $attach) = (@$ref);
-    SendSQL("select long_desc from bugs where bug_id = $bug");
-    my $comment = FetchOneColumn() . "Created an attachment (id=$attach)";
-
-    if ($comment =~ m@-* Additional Comments From ([^ ]*)[- 0-9/:]*\nCreated an attachment \(id=$attach\)@) {
-	print "Found $1\n";
-	SendSQL("select userid from profiles where login_name=" .
-		SqlQuote($1));
-	my $userid = FetchOneColumn();
-	if (defined $userid && $userid > 0) {
-	    SendSQL("update attachments set submitter_id=$userid where attach_id = $attach");
-	}
-    } else {
-	print "Bug $bug can't find comment for attachment $attach\n";
-    }
-}
-
-
-
-
-
-
-6/14/99 Added "BeOS" to the list of OS's. Feed this to mysql:
-
-	alter table bugs change column op_sys op_sys enum("All", "Windows 3.1", "Windows 95", "Windows 98", "Windows NT", "Mac System 7", "Mac System 7.5", "Mac System 7.6.1", "Mac System 8.0", "Mac System 8.5", "Mac System 8.6", "AIX", "BSDI", "HP-UX", "IRIX", "Linux", "FreeBSD", "OSF/1", "Solaris", "SunOS", "Neutrino", "OS/2", "BeOS", "other") not null;
-
-
-5/27/99 Added support for dependency information.  You must run the new
-"makedependenciestable.sh" script.  You can turn off dependencies with the new
-"usedependencies" param, but it defaults to being on.  Also, read very
-carefully the description for the new "webdotbase" param; you will almost
-certainly need to tweak it.
-
-
-5/24/99 Added "Mac System 8.6" and "Neutrino" to the list of OS's.
-Feed this to mysql:
-
-	alter table bugs change column op_sys op_sys enum("All", "Windows 3.1", "Windows 95", "Windows 98", "Windows NT", "Mac System 7", "Mac System 7.5", "Mac System 7.6.1", "Mac System 8.0", "Mac System 8.5", "Mac System 8.6", "AIX", "BSDI", "HP-UX", "IRIX", "Linux", "FreeBSD", "OSF/1", "Solaris", "SunOS", "Neutrino", "OS/2", "other") not null;
-
-
-5/12/99 Added a pref to control how much email you get.  This needs a new
-column in the profiles table, so feed the following to mysql:
-
-	alter table profiles add column emailnotification enum("ExcludeSelfChanges", "CConly", "All") not null default "ExcludeSelfChanges";
-
-5/5/99 Added the ability to search by creation date.  To make this perform
-well, you ought to do the following:
-
-	alter table bugs change column creation_ts creation_ts datetime not null, add index (creation_ts);
-
-
-4/30/99 Added a new severity, "blocker".  To get this into your running
-Bugzilla, do the following:
-
-	alter table bugs change column bug_severity bug_severity enum("blocker", "critical", "major", "normal", "minor", "trivial", "enhancement") not null;
-
-
-4/22/99 There was a bug where the long descriptions of bugs had a variety of
-newline characters at the end, depending on the operating system of the browser
-that submitted the text.  This bug has been fixed, so that no further changes
-like that will happen.  But to fix problems that have already crept into your
-database, you can run the following perl script (which is slow and ugly, but
-does work:)
-#!/usr/bonsaitools/bin/perl -w
-use diagnostics;
-use strict;
-require "globals.pl";
-$|=1;
-ConnectToDatabase();
-SendSQL("select bug_id from bugs order by bug_id");
-my @list;
-while (MoreSQLData()) {
-    push(@list, FetchOneColumn());
-}
-foreach my $id (@list) {
-    if ($id % 50 == 0) {
-	print "\n$id ";
-    }
-    SendSQL("select long_desc from bugs where bug_id = $id");
-    my $comment = FetchOneColumn();
-    my $orig = $comment;
-    $comment =~ s/\r\n/\n/g;     # Get rid of windows-style line endings.
-    $comment =~ s/\r/\n/g;       # Get rid of mac-style line endings.
-    if ($comment ne $orig) {
-	SendSQL("update bugs set long_desc = " . SqlQuote($comment) .
-		" where bug_id = $id");
-	print ".";
-    } else {
-	print "-";
-    }
-}
-
-
-
-4/8/99 Added ability to store patches with bugs.  This requires a new table
-to store the data, so you will need to run the "makeattachmenttable.sh" script.
-
-3/25/99 Unfortunately, the HTML::FromText CPAN module had too many bugs, and
-so I had to roll my own.  We no longer use the HTML::FromText CPAN module.
-
-3/24/99 (This entry has been removed.  It used to say that we required the
-HTML::FromText CPAN module, but that's no longer true.)
-
-3/22/99 Added the ability to query by fields which have changed within a date
-range.  To make this perform a bit better, we need a new index:
-
-	alter table bugs_activity add index (field);
-
-3/10/99 Added 'groups' stuff, where we have different group bits that we can
-put on a person or on a bug.  Some of the group bits control access to bugzilla
-features.  And a person can't access a bug unless he has every group bit set
-that is also set on the bug.  See the comments in makegroupstable.sh for a bit
-more info.
-
-The 'maintainer' param is now used only as an email address for people to send
-complaints to.  The groups table is what is now used to determine permissions.
-
-You will need to run the new script "makegroupstable.sh".  And then you need to
-feed the following lines to MySQL (replace XXX with the login name of the
-maintainer, the person you wish to be all-powerful).
-
-	alter table bugs add column groupset bigint not null;
-	alter table profiles add column groupset bigint not null;
-	update profiles set groupset=0x7fffffffffffffff where login_name = XXX;
-
-
-
-3/8/99 Added params to control how priorities are set in a new bug.  You can
-now choose whether to let submitters of new bugs choose a priority, or whether
-they should just accept the default priority (which is now no longer hardcoded
-to "P2", but is instead a param.)  The default value of the params will cause
-the same behavior as before.
-
-3/3/99 Added a "disallownew" field to the products table.  If non-zero, then
-don't let people file new bugs against this product.  (This is for when a 
-product is retired, but you want to keep the bug reports around for posterity.)
-Feed this to MySQL:
-
-	alter table products add column disallownew tinyint not null;
-
-
-2/8/99 Added FreeBSD to the list of OS's.  Feed this to MySQL:
-
-	alter table bugs change column op_sys op_sys enum("All", "Windows 3.1", "Windows 95", "Windows 98", "Windows NT", "Mac System 7", "Mac System 7.5", "Mac System 7.6.1", "Mac System 8.0", "Mac System 8.5", "AIX", "BSDI", "HP-UX", "IRIX", "Linux", "FreeBSD", "OSF/1", "Solaris", "SunOS", "OS/2", "other") not null;
-
-
-2/4/99 Added a new column "description" to the components table, and added 
-links to a new page which will use this to describe the components of a 
-given product.  Feed this to MySQL:
-
-	alter table components add column description mediumtext not null;
-
-
-2/3/99 Added a new column "initialqacontact" to the components table that gives
-an initial QA contact field.  It may be empty if you wish the initial qa
-contact to be empty.  If you're not using the QA contact field, you don't need
-to add this column, but you might as well be safe and add it anyway:
-
-	alter table components add column initialqacontact tinytext not null;
-
-
-2/2/99 Added a new column "milestoneurl" to the products table that gives a URL
-which is to describe the currently defined milestones for a product.  If you
-don't use target milestone, you might be able to get away without adding this
-column, but you might as well be safe and add it anyway:
-
-	alter table products add column milestoneurl tinytext not null;
-
-
-1/29/99 Whoops; had a misspelled op_sys.  It was "Mac System 7.1.6"; it should
-be "Mac System 7.6.1".  It turns out I had no bugs with this value set, so I
-could just do the below simple command.  If you have bugs with this value, you
-may need to do something more complicated.
-
-	alter table bugs change column op_sys op_sys enum("All", "Windows 3.1", "Windows 95", "Windows 98", "Windows NT", "Mac System 7", "Mac System 7.5", "Mac System 7.6.1", "Mac System 8.0", "Mac System 8.5", "AIX", "BSDI", "HP-UX", "IRIX", "Linux", "OSF/1", "Solaris", "SunOS", "OS/2", "other") not null;
-
-
-
-1/20/99 Added new fields: Target Milestone, QA Contact, and Status Whiteboard.
-These fields are all optional in the UI; there are parameters to turn them on.
-However, whether or not you use them, the fields need to be in the DB.  There
-is some code that needs them, even if you don't.
-
-To update your DB to have these fields, send the following to MySQL:
-
-        alter table bugs add column target_milestone varchar(20) not null,
-                add column qa_contact mediumint not null,
-                add column status_whiteboard mediumtext not null,
-                add index (target_milestone), add index (qa_contact);
-
-
-
-1/18/99 You can now query by CC.  To make this perform reasonably, the CC table
-needs some indices.  The following MySQL does the necessary stuff:
-
-	alter table cc add index (bug_id), add index (who);
-
-
-1/15/99 The op_sys field can now be queried by (and more easily tweaked).
-To make this perform reasonably, it needs an index.  The following MySQL 
-command will create the necessary index:
-
-	alter table bugs add index (op_sys);
-
-
-12/2/98 The op_sys and rep_platform fields have been tweaked.  op_sys
-is now an enum, rather than having the legal values all hard-coded in
-perl.  rep_platform now no longer allows a value of "X-Windows".
-
-Here's how I ported to the new world.  This ought to work for you too.
-Actually, it's probably overkill.  I had a lot of illegal values for op_sys
-in my tables, from importing bugs from strange places.  If you haven't done 
-anything funky, then much of the below will be a no-op.
-
-First, send the following commands to MySQL to make sure all your values for
-rep_platform and op_sys are legal in the new world..
-
-	update bugs set rep_platform="Sun" where rep_platform="X-Windows" and op_sys like "Solaris%";
-	update bugs set rep_platform="SGI" where rep_platform="X-Windows" and op_sys = "IRIX";
-	update bugs set rep_platform="SGI" where rep_platform="X-Windows" and op_sys = "HP-UX";
-	update bugs set rep_platform="DEC" where rep_platform="X-Windows" and op_sys = "OSF/1";
-	update bugs set rep_platform="PC" where rep_platform="X-Windows" and op_sys = "Linux";
-	update bugs set rep_platform="other" where rep_platform="X-Windows";
-	update bugs set rep_platform="other" where rep_platform="";
-	update bugs set op_sys="Mac System 7" where op_sys="System 7";
-	update bugs set op_sys="Mac System 7.5" where op_sys="System 7.5";
-	update bugs set op_sys="Mac System 8.0" where op_sys="8.0";
-	update bugs set op_sys="OSF/1" where op_sys="Digital Unix 4.0";
-	update bugs set op_sys="IRIX" where op_sys like "IRIX %";
-	update bugs set op_sys="HP-UX" where op_sys like "HP-UX %";
-	update bugs set op_sys="Windows NT" where op_sys like "NT %";
-	update bugs set op_sys="OSF/1" where op_sys like "OSF/1 %";
-	update bugs set op_sys="Solaris" where op_sys like "Solaris %";
-	update bugs set op_sys="SunOS" where op_sys like "SunOS%";
-	update bugs set op_sys="other" where op_sys = "Motif";
-	update bugs set op_sys="other" where op_sys = "Other";
-
-Next, send the following commands to make sure you now have only legal
-entries in your table.  If either of the queries do not come up empty, then
-you have to do more stuff like the above.
-
-	select bug_id,op_sys,rep_platform from bugs where rep_platform not regexp "^(All|DEC|HP|Macintosh|PC|SGI|Sun|X-Windows|Other)$";
-	select bug_id,op_sys,rep_platform from bugs where op_sys not regexp "^(All|Windows 3.1|Windows 95|Windows 98|Windows NT|Mac System 7|Mac System 7.5|Mac System 7.1.6|Mac System 8.0|AIX|BSDI|HP-UX|IRIX|Linux|OSF/1|Solaris|SunOS|other)$";
-
-Finally, once that's all clear, alter the table to make enforce the new legal
-entries:
-
-	alter table bugs change column op_sys op_sys enum("All", "Windows 3.1", "Windows 95", "Windows 98", "Windows NT", "Mac System 7", "Mac System 7.5", "Mac System 7.1.6", "Mac System 8.0", "AIX", "BSDI", "HP-UX", "IRIX", "Linux", "OSF/1", "Solaris", "SunOS", "other") not null, change column rep_platform rep_platform enum("All", "DEC", "HP", "Macintosh", "PC", "SGI", "Sun", "Other");
-
-
-
-
-
-11/20/98 Added searching of CC field.  To better support this, added
-some indexes to the CC table.  You probably want to execute the following
-mysql commands:
-
-	alter table cc add index (bug_id);
-	alter table cc add index (who);
-
-
-10/27/98 security check for legal products in place. bug charts are not
-available as an option if collectstats.pl has never been run. all products 
-get daily stats collected now. README updated: Chart::Base is listed as
-a requirement, instructions for using collectstats.pl included as 
-an optional step. also got silly and added optional quips to bug
-reports. 
-
-10/17/98 modified README installation instructions slightly. 
-
-10/7/98 Added a new table called "products".  Right now, this is used
-only to have a description for each product, and that description is
-only used when initially adding a new bug.  Anyway, you *must* create
-the new table (which you can do by running the new makeproducttable.sh
-script).  If you just leave it empty, things will work much as they
-did before, or you can add descriptions for some or all of your
-products.
-
-
-9/15/98 Everything has been ported to Perl.  NO MORE TCL.  This
-transition should be relatively painless, except for the "params"
-file.  This is the file that contains parameters you've set up on the
-editparams.cgi page.  Before changing to Perl, this was a tcl-syntax
-file, stored in the same directory as the code; after the change to
-Perl, it becomes a perl-syntax file, stored in a subdirectory named
-"data".  See the README file for more details on what version of Perl
-you need.
-
-So, if updating from an older version of Bugzilla, you will need to
-edit data/param, change the email address listed for
-$::param{'maintainer'}, and then go revisit the editparams.cgi page
-and reset all the parameters to your taste.  Fortunately, your old
-params file will still be around, and so you ought to be able to
-cut&paste important bits from there.
-
-Also, note that the "whineatnews" script has changed name (it now has
-an extension of .pl instead of .tcl), so you'll need to change your
-cron job.
-
-And the "comments" file has been moved to the data directory.  Just do
-"cat comments >> data/comments" to restore any old comments that may
-have been lost.
-
-
-
-9/2/98 Changed the way password validation works.  We now keep a
-crypt'd version of the password in the database, and check against
-that.  (This is silly, because we're also keeping the plaintext
-version there, but I have plans...)  Stop passing the plaintext
-password around as a cookie; instead, we have a cookie that references
-a record in a new database table, logincookies.
-
-IMPORTANT: if updating from an older version of Bugzilla, you must run
-the following commands to keep things working:
-
- ./makelogincookiestable.sh
- echo "alter table profiles add column cryptpassword varchar(64);" | mysql bugs
- echo "update profiles set cryptpassword = encrypt(password,substring(rand(),3, 4));" | mysql bugs
-

mozilla/webtools/bugzilla/attachment.cgi

@@ -1,792 +0,0 @@
-#!/usr/bonsaitools/bin/perl -wT
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-#
-# 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 the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-#                 Myk Melez <myk@mozilla.org>
-
-################################################################################
-# Script Initialization
-################################################################################
-
-# Make it harder for us to do dangerous things in Perl.
-use diagnostics;
-use strict;
-
-use lib qw(.);
-
-use vars qw(
-  $template
-  $vars
-);
-
-# Include the Bugzilla CGI and general utility library.
-require "CGI.pl";
-
-# Establish a connection to the database backend.
-ConnectToDatabase();
-
-# Check whether or not the user is logged in and, if so, set the $userid 
-my $userid = quietly_check_login();
-
-################################################################################
-# Main Body Execution
-################################################################################
-
-# All calls to this script should contain an "action" variable whose value
-# determines what the user wants to do.  The code below checks the value of
-# that variable and runs the appropriate code.
-
-# Determine whether to use the action specified by the user or the default.
-my $action = $::FORM{'action'} || 'view';
-
-if ($action eq "view")  
-{ 
-  validateID();
-  view(); 
-}
-elsif ($action eq "viewall") 
-{ 
-  ValidateBugID($::FORM{'bugid'}, $userid);
-  viewall(); 
-}
-elsif ($action eq "enter") 
-{ 
-  my $userid = confirm_login();
-  ValidateBugID($::FORM{'bugid'}, $userid);
-  enter(); 
-}
-elsif ($action eq "insert")
-{
-  my $userid = confirm_login();
-  ValidateBugID($::FORM{'bugid'}, $userid);
-  ValidateComment($::FORM{'comment'});
-  validateFilename();
-  validateData();
-  validateDescription();
-  validateIsPatch();
-  validateContentType() unless $::FORM{'ispatch'};
-  validateObsolete() if $::FORM{'obsolete'};
-  insert();
-}
-elsif ($action eq "edit") 
-{ 
-  quietly_check_login();
-  validateID();
-  validateCanEdit($::FORM{'id'});
-  edit(); 
-}
-elsif ($action eq "update") 
-{ 
-  my $userid = confirm_login();
-  UserInGroup($userid, "editbugs")
-    || DisplayError("You are not authorized to edit attachments.")
-    && exit;
-  ValidateComment($::FORM{'comment'});
-  validateID();
-  validateCanEdit($::FORM{'id'});
-  validateDescription();
-  validateIsPatch();
-  validateContentType() unless $::FORM{'ispatch'};
-  validateIsObsolete();
-  validateStatuses();
-  update();
-}
-else 
-{ 
-  DisplayError("I could not figure out what you wanted to do.")
-}
-
-exit;
-
-################################################################################
-# Data Validation / Security Authorization
-################################################################################
-
-sub validateID
-{
-  # Validate the value of the "id" form field, which must contain an
-  # integer that is the ID of an existing attachment.
-
-  detaint_natural($::FORM{'id'})
-    || DisplayError("You did not enter a valid attachment number.") 
-      && exit;
-  
-  # Make sure the attachment exists in the database.
-  SendSQL("SELECT bug_id FROM attachments WHERE attach_id = $::FORM{'id'}");
-  MoreSQLData()
-    || DisplayError("Attachment #$::FORM{'id'} does not exist.") 
-    && exit;
-
-  # Make sure the user is authorized to access this attachment's bug.
-  my ($bugid) = FetchSQLData();
-  ValidateBugID($bugid, $userid);
-}
-
-sub validateCanEdit
-{
-    my ($attach_id) = (@_);
-
-    # If the user is not logged in, claim that they can edit. This allows
-    # the edit scrren to be displayed to people who aren't logged in.
-    # People not logged in can't actually commit changes, because that code
-    # calls confirm_login, not quietly_check_login, before calling this sub
-    return if $userid == 0;
-
-    # People in editbugs can edit all attachments
-    return if UserInGroup($userid, "editbugs");
-
-    # Bug 97729 - the submitter can edit their attachments
-    SendSQL("SELECT attach_id FROM attachments WHERE " .
-            "attach_id = $attach_id AND submitter_id = $userid");
-
-    FetchSQLData()
-      || DisplayError("You are not authorised to edit attachment #$attach_id")
-      && exit;
-}
-
-sub validateDescription
-{
-  $::FORM{'description'}
-    || DisplayError("You must enter a description for the attachment.")
-      && exit;
-}
-
-sub validateIsPatch
-{
-  # Set the ispatch flag to zero if it is undefined, since the UI uses
-  # an HTML checkbox to represent this flag, and unchecked HTML checkboxes
-  # do not get sent in HTML requests.
-  $::FORM{'ispatch'} = $::FORM{'ispatch'} ? 1 : 0;
-
-  # Set the content type to text/plain if the attachment is a patch.
-  $::FORM{'contenttype'} = "text/plain" if $::FORM{'ispatch'};
-}
-
-sub validateContentType
-{
-  if (!$::FORM{'contenttypemethod'})
-  {
-    DisplayError("You must choose a method for determining the content type,
-      either <em>auto-detect</em>, <em>select from list</em>, or <em>enter 
-      manually</em>.");
-    exit;
-  }
-  elsif ($::FORM{'contenttypemethod'} eq 'autodetect')
-  {
-    # The user asked us to auto-detect the content type, so use the type
-    # specified in the HTTP request headers.
-    if ( !$::FILE{'data'}->{'contenttype'} )
-    {
-      DisplayError("You asked Bugzilla to auto-detect the content type, but
-        your browser did not specify a content type when uploading the file, 
-        so you must enter a content type manually.");
-      exit;
-    }
-    $::FORM{'contenttype'} = $::FILE{'data'}->{'contenttype'};
-  }
-  elsif ($::FORM{'contenttypemethod'} eq 'list')
-  {
-    # The user selected a content type from the list, so use their selection.
-    $::FORM{'contenttype'} = $::FORM{'contenttypeselection'};
-  }
-  elsif ($::FORM{'contenttypemethod'} eq 'manual')
-  {
-    # The user entered a content type manually, so use their entry.
-    $::FORM{'contenttype'} = $::FORM{'contenttypeentry'};
-  }
-  else
-  {
-    my $htmlcontenttypemethod = html_quote($::FORM{'contenttypemethod'});
-    DisplayError("Your form submission got corrupted somehow.  The <em>content
-      method</em> field, which specifies how the content type gets determined,
-      should have been either <em>autodetect</em>, <em>list</em>, 
-      or <em>manual</em>, but was instead <em>$htmlcontenttypemethod</em>.");
-    exit;
-  }
-
-  if ( $::FORM{'contenttype'} !~ /^(application|audio|image|message|model|multipart|text|video)\/.+$/ )
-  {
-    my $htmlcontenttype = html_quote($::FORM{'contenttype'});
-    DisplayError("The content type <em>$htmlcontenttype</em> is invalid.
-      Valid types must be of the form <em>foo/bar</em> where <em>foo</em> 
-      is either <em>application, audio, image, message, model, multipart, 
-      text,</em> or <em>video</em>.");
-    exit;
-  }
-}
-
-sub validateIsObsolete
-{
-  # Set the isobsolete flag to zero if it is undefined, since the UI uses
-  # an HTML checkbox to represent this flag, and unchecked HTML checkboxes
-  # do not get sent in HTML requests.
-  $::FORM{'isobsolete'} = $::FORM{'isobsolete'} ? 1 : 0;
-}
-
-sub validateStatuses
-{
-  # Get a list of attachment statuses that are valid for this attachment.
-  PushGlobalSQLState();
-  SendSQL("SELECT  attachstatusdefs.id
-           FROM    attachments, bugs, attachstatusdefs
-           WHERE   attachments.attach_id = $::FORM{'id'}
-           AND     attachments.bug_id = bugs.bug_id
-           AND     attachstatusdefs.product = bugs.product");
-  my @statusdefs;
-  push(@statusdefs, FetchSQLData()) while MoreSQLData();
-  PopGlobalSQLState();
-  
-  foreach my $status (@{$::MFORM{'status'}})
-  {
-    grep($_ == $status, @statusdefs)
-      || DisplayError("One of the statuses you entered is not a valid status
-                       for this attachment.")
-        && exit;
-    # We have tested that the status is valid, so it can be detainted
-    detaint_natural($status);
-  }
-}
-
-sub validateData
-{
-  $::FORM{'data'}
-    || DisplayError("The file you are trying to attach is empty!")
-      && exit;
-
-  my $len = length($::FORM{'data'});
-
-  my $maxpatchsize = Param('maxpatchsize');
-  my $maxattachmentsize = Param('maxattachmentsize');
-  
-  # Makes sure the attachment does not exceed either the "maxpatchsize" or 
-  # the "maxattachmentsize" parameter.
-  if ( $::FORM{'ispatch'} && $maxpatchsize && $len > $maxpatchsize*1024 )
-  {
-    my $lenkb = sprintf("%.0f", $len/1024);
-    DisplayError("The file you are trying to attach is ${lenkb} kilobytes (KB) in size.  
-                  Patches cannot be more than ${maxpatchsize}KB in size.
-                  Try breaking your patch into several pieces.");
-    exit;
-  } elsif ( !$::FORM{'ispatch'} && $maxattachmentsize && $len > $maxattachmentsize*1024 ) {
-    my $lenkb = sprintf("%.0f", $len/1024);
-    DisplayError("The file you are trying to attach is ${lenkb} kilobytes (KB) in size.  
-                  Non-patch attachments cannot be more than ${maxattachmentsize}KB.
-                  If your attachment is an image, try converting it to a compressable
-                  format like JPG or PNG, or put it elsewhere on the web and
-                  link to it from the bug's URL field or in a comment on the bug.");
-    exit;
-  }
-}
-
-sub validateFilename
-{
-  defined $::FILE{'data'}
-    || DisplayError("You did not specify a file to attach.")
-      && exit;
-}
-
-sub validateObsolete
-{
-  # Make sure the attachment id is valid and the user has permissions to view
-  # the bug to which it is attached.
-  foreach my $attachid (@{$::MFORM{'obsolete'}}) {
-    detaint_natural($attachid)
-      || DisplayError("The attachment number of one of the attachments 
-           you wanted to obsolete is invalid.") 
-        && exit;
-  
-    SendSQL("SELECT bug_id, isobsolete, description 
-             FROM attachments WHERE attach_id = $attachid");
-
-    # Make sure the attachment exists in the database.
-    MoreSQLData()
-      || DisplayError("Attachment #$attachid does not exist.") 
-        && exit;
-
-    my ($bugid, $isobsolete, $description) = FetchSQLData();
-
-    if ($bugid != $::FORM{'bugid'})
-    {
-      $description = html_quote($description);
-      DisplayError("Attachment #$attachid ($description) is attached 
-        to bug #$bugid, but you tried to flag it as obsolete while
-        creating a new attachment to bug #$::FORM{'bugid'}.");
-      exit;
-    }
-
-    if ( $isobsolete )
-    {
-      $description = html_quote($description);
-      DisplayError("Attachment #$attachid ($description) is already obsolete.");
-      exit;
-    }
-
-    # Check that the user can modify this attachment
-    validateCanEdit($attachid);
-  }
-
-}
-
-################################################################################
-# Functions
-################################################################################
-
-sub view
-{
-  # Display an attachment.
-
-  # Retrieve the attachment content and its content type from the database.
-  SendSQL("SELECT mimetype, thedata FROM attachments WHERE attach_id = $::FORM{'id'}");
-  my ($contenttype, $thedata) = FetchSQLData();
-    
-  # Return the appropriate HTTP response headers.
-  print "Content-Type: $contenttype\n\n";
-
-  print $thedata;
-}
-
-
-sub viewall
-{
-  # Display all attachments for a given bug in a series of IFRAMEs within one HTML page.
-
-  # Retrieve the attachments from the database and write them into an array
-  # of hashes where each hash represents one attachment.
-  SendSQL("SELECT attach_id, creation_ts, mimetype, description, ispatch, isobsolete 
-           FROM attachments WHERE bug_id = $::FORM{'bugid'} ORDER BY attach_id");
-  my @attachments; # the attachments array
-  while (MoreSQLData())
-  {
-    my %a; # the attachment hash
-    ($a{'attachid'}, $a{'date'}, $a{'contenttype'}, 
-     $a{'description'}, $a{'ispatch'}, $a{'isobsolete'}) = FetchSQLData();
-
-    # Format the attachment's creation/modification date into something readable.
-    if ($a{'date'} =~ /^(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) {
-        $a{'date'} = "$3/$4/$2&nbsp;$5:$6";
-    }
-
-    # Flag attachments as to whether or not they can be viewed (as opposed to
-    # being downloaded).  Currently I decide they are viewable if their MIME type 
-    # is either text/*, image/*, or application/vnd.mozilla.*.
-    # !!! Yuck, what an ugly hack.  Fix it!
-    $a{'isviewable'} = ( $a{'contenttype'} =~ /^(text|image|application\/vnd\.mozilla\.)/ );
-
-    # Retrieve a list of status flags that have been set on the attachment.
-    PushGlobalSQLState();
-    SendSQL("SELECT    name 
-             FROM      attachstatuses, attachstatusdefs 
-             WHERE     attach_id = $a{'attachid'} 
-             AND       attachstatuses.statusid = attachstatusdefs.id
-             ORDER BY  sortkey");
-    my @statuses;
-    push(@statuses, FetchSQLData()) while MoreSQLData();
-    $a{'statuses'} = \@statuses;
-    PopGlobalSQLState();
-
-    # Add the hash representing the attachment to the array of attachments.
-    push @attachments, \%a;
-  }
-
-  # Retrieve the bug summary for displaying on screen.
-  SendSQL("SELECT short_desc FROM bugs WHERE bug_id = $::FORM{'bugid'}");
-  my ($bugsummary) = FetchSQLData();
-
-  # Define the variables and functions that will be passed to the UI template.
-  $vars->{'bugid'} = $::FORM{'bugid'};
-  $vars->{'bugsummary'} = $bugsummary;
-  $vars->{'attachments'} = \@attachments;
-
-  # Return the appropriate HTTP response headers.
-  print "Content-Type: text/html\n\n";
-
-  # Generate and return the UI (HTML page) from the appropriate template.
-  $template->process("attachment/show-multiple.html.tmpl", $vars)
-    || ThrowTemplateError($template->error());
-}
-
-
-sub enter
-{
-  # Display a form for entering a new attachment.
-
-  # Retrieve the attachments the user can edit from the database and write
-  # them into an array of hashes where each hash represents one attachment.
-  my $canEdit = "";
-  if (!UserInGroup($userid, "editbugs")) {
-      $canEdit = "AND submitter_id = $userid";
-  }
-  SendSQL("SELECT attach_id, description 
-           FROM attachments
-           WHERE bug_id = $::FORM{'bugid'}
-           AND isobsolete = 0 $canEdit
-           ORDER BY attach_id");
-  my @attachments; # the attachments array
-  while ( MoreSQLData() ) {
-    my %a; # the attachment hash
-    ($a{'id'}, $a{'description'}) = FetchSQLData();
-
-    # Add the hash representing the attachment to the array of attachments.
-    push @attachments, \%a;
-  }
-
-  # Retrieve the bug summary for displaying on screen.
-  SendSQL("SELECT short_desc FROM bugs WHERE bug_id = $::FORM{'bugid'}");
-  my ($bugsummary) = FetchSQLData();
-
-  # Define the variables and functions that will be passed to the UI template.
-  $vars->{'bugid'} = $::FORM{'bugid'};
-  $vars->{'bugsummary'} = $bugsummary;
-  $vars->{'attachments'} = \@attachments;
-
-  # Return the appropriate HTTP response headers.
-  print "Content-Type: text/html\n\n";
-
-  # Generate and return the UI (HTML page) from the appropriate template.
-  $template->process("attachment/create.html.tmpl", $vars)
-    || ThrowTemplateError($template->error());
-}
-
-
-sub insert
-{
-  # Insert a new attachment into the database.
-
-  # Escape characters in strings that will be used in SQL statements.
-  my $filename = SqlQuote($::FILE{'data'}->{'filename'});
-  my $description = SqlQuote($::FORM{'description'});
-  my $contenttype = SqlQuote($::FORM{'contenttype'});
-  my $thedata = SqlQuote($::FORM{'data'});
-
-  # Insert the attachment into the database.
-  SendSQL("INSERT INTO attachments (bug_id, filename, description, mimetype, ispatch, submitter_id, thedata) 
-           VALUES ($::FORM{'bugid'}, $filename, $description, $contenttype, $::FORM{'ispatch'}, $userid, $thedata)");
-
-  # Retrieve the ID of the newly created attachment record.
-  my $attachid = CurrId('attachments_attach_id_seq');
-
-  # Insert a comment about the new attachment into the database.
-  my $comment = "Created an attachment (id=$attachid)\n$::FORM{'description'}\n";
-  $comment .= ("\n" . $::FORM{'comment'}) if $::FORM{'comment'};
-
-  use Text::Wrap;
-  $Text::Wrap::columns = 80;
-  $Text::Wrap::huge = 'overflow';
-  $comment = Text::Wrap::wrap('', '', $comment);
-
-  AppendComment($::FORM{'bugid'}, 
-                $::COOKIE{"Bugzilla_login"},
-                $comment);
-
-  # Make existing attachments obsolete.
-  my $fieldid = GetFieldID('attachments.isobsolete');
-  foreach my $attachid (@{$::MFORM{'obsolete'}}) {
-    SendSQL("UPDATE attachments SET isobsolete = 1 WHERE attach_id = $attachid");
-    SendSQL("INSERT INTO bugs_activity (bug_id, attach_id, who, bug_when, fieldid, removed, added) 
-             VALUES ($::FORM{'bugid'}, $attachid, $userid, NOW(), $fieldid, '0', '1')");
-  }
-
-  # Send mail to let people know the attachment has been created.  Uses a 
-  # special syntax of the "open" and "exec" commands to capture the output of 
-  # "processmail", which "system" doesn't allow, without running the command 
-  # through a shell, which backticks (``) do.
-  #system ("./processmail", $bugid , $userid);
-  #my $mailresults = `./processmail $bugid $::userid`;
-  my $mailresults = '';
-  open(PMAIL, "-|") or exec('./processmail', $::FORM{'bugid'}, $::COOKIE{'Bugzilla_login'});
-  $mailresults .= $_ while <PMAIL>;
-  close(PMAIL);
- 
-  # Define the variables and functions that will be passed to the UI template.
-  $vars->{'bugid'} = $::FORM{'bugid'};
-  $vars->{'attachid'} = $attachid;
-  $vars->{'description'} = $description;
-  $vars->{'mailresults'} = $mailresults;
-  $vars->{'contenttypemethod'} = $::FORM{'contenttypemethod'};
-  $vars->{'contenttype'} = $::FORM{'contenttype'};
-
-  # Return the appropriate HTTP response headers.
-  print "Content-Type: text/html\n\n";
-
-  # Generate and return the UI (HTML page) from the appropriate template.
-  $template->process("attachment/created.html.tmpl", $vars)
-    || ThrowTemplateError($template->error());
-  SendSQL("SELECT short_desc FROM bugs WHERE bug_id = $::FORM{'bugid'}");
-}
-
-
-sub edit
-{
-  # Edit an attachment record.  Users with "editbugs" privileges, (or the 
-  # original attachment's submitter) can edit the attachment's description,
-  # content type, ispatch and isobsolete flags, and statuses, and they can
-  # also submit a comment that appears in the bug.
-  # Users cannot edit the content of the attachment itself.
-
-  # Retrieve the attachment from the database.
-  SendSQL("SELECT description, mimetype, bug_id, ispatch, isobsolete 
-           FROM attachments WHERE attach_id = $::FORM{'id'}");
-  my ($description, $contenttype, $bugid, $ispatch, $isobsolete) = FetchSQLData();
-
-  # Flag attachment as to whether or not it can be viewed (as opposed to
-  # being downloaded).  Currently I decide it is viewable if its content
-  # type is either text/.* or application/vnd.mozilla.*.
-  # !!! Yuck, what an ugly hack.  Fix it!
-  my $isviewable = ( $contenttype =~ /^(text|image|application\/vnd\.mozilla\.)/ );
-
-  # Retrieve a list of status flags that have been set on the attachment.
-  my %statuses;
-  SendSQL("SELECT  id, name 
-           FROM    attachstatuses, attachstatusdefs 
-           WHERE   attachstatuses.statusid = attachstatusdefs.id 
-           AND     attach_id = $::FORM{'id'}");
-  while ( my ($id, $name) = FetchSQLData() )
-  {
-    $statuses{$id} = $name;
-  }
-
-  # Retrieve a list of statuses for this bug's product, and build an array 
-  # of hashes in which each hash is a status flag record.
-  # ???: Move this into versioncache or its own routine?
-  my @statusdefs;
-  SendSQL("SELECT   id, name 
-           FROM     attachstatusdefs, bugs 
-           WHERE    bug_id = $bugid 
-           AND      attachstatusdefs.product = bugs.product 
-           ORDER BY sortkey");
-  while ( MoreSQLData() )
-  {
-    my ($id, $name) = FetchSQLData();
-    push @statusdefs, { 'id' => $id , 'name' => $name };
-  }
-
-  # Retrieve a list of attachments for this bug as well as a summary of the bug
-  # to use in a navigation bar across the top of the screen.
-  SendSQL("SELECT attach_id FROM attachments WHERE bug_id = $bugid ORDER BY attach_id");
-  my @bugattachments;
-  push(@bugattachments, FetchSQLData()) while (MoreSQLData());
-  SendSQL("SELECT short_desc FROM bugs WHERE bug_id = $bugid");
-  my ($bugsummary) = FetchSQLData();
-
-  # Define the variables and functions that will be passed to the UI template.
-  $vars->{'attachid'} = $::FORM{'id'}; 
-  $vars->{'description'} = $description; 
-  $vars->{'contenttype'} = $contenttype; 
-  $vars->{'bugid'} = $bugid; 
-  $vars->{'bugsummary'} = $bugsummary; 
-  $vars->{'ispatch'} = $ispatch; 
-  $vars->{'isobsolete'} = $isobsolete; 
-  $vars->{'isviewable'} = $isviewable; 
-  $vars->{'statuses'} = \%statuses; 
-  $vars->{'statusdefs'} = \@statusdefs; 
-  $vars->{'attachments'} = \@bugattachments; 
-
-  # Return the appropriate HTTP response headers.
-  print "Content-Type: text/html\n\n";
-
-  # Generate and return the UI (HTML page) from the appropriate template.
-  $template->process("attachment/edit.html.tmpl", $vars)
-    || ThrowTemplateError($template->error());
-}
-
-
-sub update 
-{
-  # Update an attachment record.
-
-  # Get the bug ID for the bug to which this attachment is attached.
-  SendSQL("SELECT bug_id FROM attachments WHERE attach_id = $::FORM{'id'}");
-  my $bugid = FetchSQLData() 
-    || DisplayError("Cannot figure out bug number.")
-    && exit;
-
-  # Lock database tables in preparation for updating the attachment.
-  if ($::driver eq 'mysql') {
-    SendSQL("LOCK TABLES attachments WRITE , attachstatuses WRITE , 
-             attachstatusdefs READ , fielddefs READ , bugs_activity WRITE");
-  }
-
-  # Get a copy of the attachment record before we make changes
-  # so we can record those changes in the activity table.
-  SendSQL("SELECT description, mimetype, ispatch, isobsolete 
-           FROM attachments WHERE attach_id = $::FORM{'id'}");
-  my ($olddescription, $oldcontenttype, $oldispatch, $oldisobsolete) = FetchSQLData();
-
-  # Get the list of old status flags.
-  SendSQL("SELECT    attachstatusdefs.name 
-           FROM      attachments, attachstatuses, attachstatusdefs
-           WHERE     attachments.attach_id = $::FORM{'id'}
-           AND       attachments.attach_id = attachstatuses.attach_id
-           AND       attachstatuses.statusid = attachstatusdefs.id
-           ORDER BY  attachstatusdefs.sortkey
-          ");
-  my @oldstatuses;
-  while (MoreSQLData()) {
-    push(@oldstatuses, FetchSQLData());
-  }
-  my $oldstatuslist = join(', ', @oldstatuses);
-
-  # Update the database with the new status flags.
-  SendSQL("DELETE FROM attachstatuses WHERE attach_id = $::FORM{'id'}");
-  foreach my $statusid (@{$::MFORM{'status'}}) 
-  {
-    SendSQL("INSERT INTO attachstatuses (attach_id, statusid) VALUES ($::FORM{'id'}, $statusid)");
-  }
-
-  # Get the list of new status flags.
-  SendSQL("SELECT    attachstatusdefs.name 
-           FROM      attachments, attachstatuses, attachstatusdefs
-           WHERE     attachments.attach_id = $::FORM{'id'}
-           AND       attachments.attach_id = attachstatuses.attach_id
-           AND       attachstatuses.statusid = attachstatusdefs.id
-           ORDER BY  attachstatusdefs.sortkey
-          ");
-  my @newstatuses;
-  while (MoreSQLData()) {
-    push(@newstatuses, FetchSQLData());
-  }
-  my $newstatuslist = join(', ', @newstatuses);
-
-  # Quote the description and content type for use in the SQL UPDATE statement.
-  my $quoteddescription = SqlQuote($::FORM{'description'});
-  my $quotedcontenttype = SqlQuote($::FORM{'contenttype'});
-
-  # Update the attachment record in the database.
-  # Sets the creation timestamp to itself to avoid it being updated automatically.
-  SendSQL("UPDATE  attachments 
-           SET     description = $quoteddescription , 
-                   mimetype = $quotedcontenttype , 
-                   ispatch = $::FORM{'ispatch'} , 
-                   isobsolete = $::FORM{'isobsolete'} , 
-                   creation_ts = creation_ts
-           WHERE   attach_id = $::FORM{'id'}
-         ");
-
-  # Record changes in the activity table.
-  if ($olddescription ne $::FORM{'description'}) {
-    my $quotedolddescription = SqlQuote($olddescription);
-    my $fieldid = GetFieldID('attachments.description');
-    SendSQL("INSERT INTO bugs_activity (bug_id, attach_id, who, bug_when, fieldid, removed, added) 
-             VALUES ($bugid, $::FORM{'id'}, $userid, NOW(), $fieldid, $quotedolddescription, $quoteddescription)");
-  }
-  if ($oldcontenttype ne $::FORM{'contenttype'}) {
-    my $quotedoldcontenttype = SqlQuote($oldcontenttype);
-    my $fieldid = GetFieldID('attachments.mimetype');
-    SendSQL("INSERT INTO bugs_activity (bug_id, attach_id, who, bug_when, fieldid, removed, added) 
-             VALUES ($bugid, $::FORM{'id'}, $userid, NOW(), $fieldid, $quotedoldcontenttype, $quotedcontenttype)");
-  }
-  if ($oldispatch ne $::FORM{'ispatch'}) {
-    my $fieldid = GetFieldID('attachments.ispatch');
-    SendSQL("INSERT INTO bugs_activity (bug_id, attach_id, who, bug_when, fieldid, removed, added) 
-             VALUES ($bugid, $::FORM{'id'}, $userid, NOW(), $fieldid, $oldispatch, $::FORM{'ispatch'})");
-  }
-  if ($oldisobsolete ne $::FORM{'isobsolete'}) {
-    my $fieldid = GetFieldID('attachments.isobsolete');
-    SendSQL("INSERT INTO bugs_activity (bug_id, attach_id, who, bug_when, fieldid, removed, added) 
-             VALUES ($bugid, $::FORM{'id'}, $userid, NOW(), $fieldid, $oldisobsolete, $::FORM{'isobsolete'})");
-  }
-  if ($oldstatuslist ne $newstatuslist) {
-    my ($removed, $added) = DiffStrings($oldstatuslist, $newstatuslist);
-    my $quotedremoved = SqlQuote($removed);
-    my $quotedadded = SqlQuote($added);
-    my $fieldid = GetFieldID('attachstatusdefs.name');
-    SendSQL("INSERT INTO bugs_activity (bug_id, attach_id, who, bug_when, fieldid, removed, added) 
-             VALUES ($bugid, $::FORM{'id'}, $userid, NOW(), $fieldid, $quotedremoved, $quotedadded)");
-  }
-
-  # Unlock all database tables now that we are finished updating the database.
-  if ($::driver eq 'mysql') {
-    SendSQL("UNLOCK TABLES");
-  }
-
-  # If this installation has enabled the request manager, let the manager know
-  # an attachment was updated so it can check for requests on that attachment
-  # and fulfill them.  The request manager allows users to request database
-  # changes of other users and tracks the fulfillment of those requests.  When
-  # an attachment record is updated and the request manager is called, it will
-  # fulfill those requests that were requested of the user performing the update
-  # which are requests for the attachment being updated.
-  #my $requests;
-  #if (Param('userequestmanager'))
-  #{
-  #  use Request;
-  #  # Specify the fieldnames that have been updated.
-  #  my @fieldnames = ('description', 'mimetype', 'status', 'ispatch', 'isobsolete');
-  #  # Fulfill pending requests.
-  #  $requests = Request::fulfillRequest('attachment', $::FORM{'id'}, @fieldnames);
-  #  $vars->{'requests'} = $requests; 
-  #}
-
-  # If the user submitted a comment while editing the attachment, 
-  # add the comment to the bug.
-  if ( $::FORM{'comment'} )
-  {
-    use Text::Wrap;
-    $Text::Wrap::columns = 80;
-    $Text::Wrap::huge = 'wrap';
-
-    # Append a string to the comment to let users know that the comment came from
-    # the "edit attachment" screen.
-    my $comment = qq|(From update of attachment $::FORM{'id'})\n| . $::FORM{'comment'};
-
-    my $wrappedcomment = "";
-    foreach my $line (split(/\r\n|\r|\n/, $comment))
-    {
-      if ( $line =~ /^>/ )
-      {
-        $wrappedcomment .= $line . "\n";
-      }
-      else
-      {
-        $wrappedcomment .= wrap('', '', $line) . "\n";
-      }
-    }
-
-    # Get the user's login name since the AppendComment function needs it.
-    my $who = DBID_to_name($userid);
-
-    # Append the comment to the list of comments in the database.
-    AppendComment($bugid, $who, $wrappedcomment);
-
-  }
-
-  # Send mail to let people know the bug has changed.  Uses a special syntax
-  # of the "open" and "exec" commands to capture the output of "processmail",
-  # which "system" doesn't allow, without running the command through a shell,
-  # which backticks (``) do.
-  #system ("./processmail", $bugid , $userid);
-  #my $mailresults = `./processmail $bugid $userid`;
-  my $mailresults = '';
-  open(PMAIL, "-|") or exec('./processmail', $bugid, DBID_to_name($userid));
-  $mailresults .= $_ while <PMAIL>;
-  close(PMAIL);
- 
-  # Define the variables and functions that will be passed to the UI template.
-  $vars->{'attachid'} = $::FORM{'id'}; 
-  $vars->{'bugid'} = $bugid; 
-  $vars->{'mailresults'} = $mailresults; 
-
-  # Return the appropriate HTTP response headers.
-  print "Content-Type: text/html\n\n";
-
-  # Generate and return the UI (HTML page) from the appropriate template.
-  $template->process("attachment/updated.html.tmpl", $vars)
-    || ThrowTemplateError($template->error());
-}

mozilla/webtools/bugzilla/bug_form.pl

@@ -1,366 +0,0 @@
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-#
-# 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 the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-#                 Dave Miller <justdave@syndicomm.com>
-
-use diagnostics;
-use strict;
-
-use RelationSet;
-
-# Use the Attachment module to display attachments for the bug.
-use Attachment;
-
-sub show_bug {    
-    # Shut up misguided -w warnings about "used only once".  For some reason,
-    # "use vars" chokes on me when I try it here.
-    sub bug_form_pl_sillyness {
-        my $zz;
-        $zz = %::FORM;
-        $zz = %::proddesc;
-        $zz = %::prodmaxvotes;
-        $zz = @::enterable_products;                                            
-        $zz = @::settable_resolution;
-        $zz = $::unconfirmedstate;
-        $zz = $::milestoneurl;
-        $zz = $::template;
-        $zz = $::vars;
-        $zz = @::legal_priority;
-        $zz = @::legal_platform;
-        $zz = @::legal_severity;
-        $zz = @::legal_bug_status;
-        $zz = @::target_milestone;
-        $zz = @::components;
-        $zz = @::legal_keywords;
-        $zz = @::versions;
-        $zz = @::legal_opsys;
-    }
-
-    # Use templates
-    my $template = $::template;
-    my $vars = $::vars;
-    
-    $vars->{'GetBugLink'} = \&GetBugLink;
-    $vars->{'quoteUrls'} = \&quoteUrls,
-    $vars->{'lsearch'} = \&lsearch,
-    $vars->{'header_done'} = (@_),
-
-    my $userid = quietly_check_login();
-
-    my $id = $::FORM{'id'};
-    
-    if (!defined($id)) {
-      $template->process("bug/choose.html.tmpl", $vars)
-        || ThrowTemplateError($template->error());
-      exit;
-    }
-    
-    my %user = %{$vars->{'user'}};
-    my %bug;
-
-    # Populate the bug hash with the info we get directly from the DB.
-    my $query = "
-SELECT
-    bugs.bug_id,
-    product,
-    version,
-    rep_platform,
-    op_sys,
-    bug_status,
-    resolution,
-    priority,
-    bug_severity,
-    component,
-    assigned_to,
-    reporter,
-    bug_file_loc,
-    short_desc,
-    target_milestone,
-    qa_contact,
-    status_whiteboard, ";
-
-    if ($::driver eq 'mysql') {
-        $query .= "
-    date_format(creation_ts, '%Y-%m-%d %H:%i'),
-    delta_ts, ";
-    } elsif ($::driver eq 'Pg') {
-        $query .= "
-    TO_CHAR(creation_ts, 'YYYY-MM-DD HH24:MI:SS'),
-    TO_CHAR(delta_ts, 'YYYYMMDDHH24MISS'), ";
-    }
-
-    $query .= "
-    SUM(votes.count)
-FROM 
-    bugs LEFT JOIN votes USING(bug_id)
-WHERE 
-    bugs.bug_id = $id
-GROUP BY 
-    bugs.bug_id,
-    product,
-    version,
-    rep_platform,
-    op_sys,
-    bug_status,
-    resolution,
-    priority,
-    bug_severity,
-    component,
-    assigned_to,
-    reporter,
-    bug_file_loc,
-    short_desc,
-    target_milestone,
-    qa_contact,
-    status_whiteboard,
-    creation_ts,
-    delta_ts ";
-
-    SendSQL($query);
-
-    my $value;
-    my @row = FetchSQLData();
-    foreach my $field ("bug_id", "product", "version", "rep_platform",
-                       "op_sys", "bug_status", "resolution", "priority",
-                       "bug_severity", "component", "assigned_to", "reporter",
-                       "bug_file_loc", "short_desc", "target_milestone",
-                       "qa_contact", "status_whiteboard", "creation_ts",
-                       "delta_ts", "votes") 
-    {
-        $value = shift(@row);
-        $bug{$field} = defined($value) ? $value : "";
-    }
-
-    # General arrays of info about the database state
-    GetVersionTable();
-
-    # Fiddle the product list.
-    my $seen_curr_prod;
-    my @prodlist;
-    
-    foreach my $product (@::enterable_products) {
-        if ($product eq $bug{'product'}) {
-            # if it's the product the bug is already in, it's ALWAYS in
-            # the popup, period, whether the user can see it or not, and
-            # regardless of the disallownew setting.
-            $seen_curr_prod = 1;
-            push(@prodlist, $product);
-            next;
-        }
-
-        next if !CanSeeProduct($userid, $product);
-
-        push(@prodlist, $product);
-    }
-
-    # The current product is part of the popup, even if new bugs are no longer
-    # allowed for that product
-    if (!$seen_curr_prod) {
-        push (@prodlist, $bug{'product'});
-        @prodlist = sort @prodlist;
-    }
-
-    $vars->{'product'} = \@prodlist;
-    $vars->{'rep_platform'} = \@::legal_platform;
-    $vars->{'priority'} = \@::legal_priority;
-    $vars->{'bug_severity'} = \@::legal_severity;
-    $vars->{'op_sys'} = \@::legal_opsys;
-    $vars->{'bug_status'} = \@::legal_bug_status;
-
-    # Hack - this array contains "" for some reason. See bug 106589.
-    shift @::settable_resolution; 
-    $vars->{'resolution'} = \@::settable_resolution;
-
-    $vars->{'component_'} = $::components{$bug{'product'}};
-    $vars->{'version'} = $::versions{$bug{'product'}};
-    $vars->{'target_milestone'} = $::target_milestone{$bug{'product'}};
-    $bug{'milestoneurl'} = $::milestoneurl{$bug{'product'}} || 
-                           "notargetmilestone.html";
-
-    $vars->{'use_votes'} = $::prodmaxvotes{$bug{'product'}};
-
-    # Add additional, calculated fields to the bug hash
-    if (@::legal_keywords) {
-        $vars->{'use_keywords'} = 1;
-
-        SendSQL("SELECT keyworddefs.name 
-                 FROM keyworddefs, keywords
-                 WHERE keywords.bug_id = $id 
-                 AND keyworddefs.id = keywords.keywordid
-                 ORDER BY keyworddefs.name");
-        my @keywords;
-        while (MoreSQLData()) {
-            push(@keywords, FetchOneColumn());
-        }
-
-        $bug{'keywords'} = \@keywords;
-    }    
-
-    # Attachments
-    $bug{'attachments'} = Attachment::query($id);
-
-    # Dependencies
-    my @list;
-    SendSQL("SELECT dependson FROM dependencies WHERE  
-             blocked = $id ORDER BY dependson");
-    while (MoreSQLData()) {
-        my ($i) = FetchSQLData();
-        push(@list, $i);
-    }
-
-    $bug{'dependson'} = \@list;
-
-    my @list2;
-    SendSQL("SELECT blocked FROM dependencies WHERE  
-             dependson = $id ORDER BY blocked");
-    while (MoreSQLData()) {
-        my ($i) = FetchSQLData();
-        push(@list2, $i);
-    }
-
-    $bug{'blocked'} = \@list2;
-
-    # Groups
-    my @groups;
-    my (%buggroups, %usergroups);
-
-    # Find out if this bug is private to any group
-    SendSQL("SELECT group_id FROM bug_group_map WHERE bug_id = $id");
-    while (my $group_id = FetchOneColumn()) {
-        $buggroups{$group_id} = 1;
-    }
-
-    # Get a list of active groups the user is in, subject to the above conditions
-    if ($userid) {
-        # NB - the number of groups is likely to be small - should we just select
-        # everything, and weed manually? OTOH, the number of products is likely
-        # to be small, too. This buggroup stuff needs to be rethought
-        SendSQL("SELECT groups.group_id, groups.isactive " .
-                "FROM user_group_map, " .
-                "groups LEFT JOIN products ON groups.name = products.product " .
-                "WHERE groups.group_id = user_group_map.group_id AND " .
-                "user_group_map.user_id = $userid AND groups.isbuggroup != 0 AND " .
-                "(groups.name = " . SqlQuote($bug{'product'}) . " OR " .
-                "products.product IS NULL)");
-        while (my $group_id = FetchOneColumn()) {
-            $usergroups{$group_id} = 1;
-        }
-
-        # Now get information about each group
-        SendSQL("SELECT group_id, name, description " .
-                "FROM groups " .
-                # "WHERE group_id IN (" . join(',', @groups) . ") " .
-                "ORDER BY description");
-        while (MoreSQLData()) {
-            my ($group_id, $name, $description) = FetchSQLData();
-            my ($ison, $ingroup);
-    
-            if ($buggroups{$group_id} || 
-                ($usergroups{$group_id} && (($name eq $bug{'product'}) || 
-                                (!defined $::proddesc{$name})))) 
-            {
-                $user{'inallgroups'} &= $ingroup;
-
-                push (@groups, { "bit" => $group_id,
-                                 "ison" => $buggroups{$group_id},
-                                 "ingroup" => $usergroups{$group_id},
-                                 "description" => $description });
-            }
-        }
-
-        # If the bug is restricted to a group, display checkboxes that allow
-        # the user to set whether or not the reporter 
-        # and cc list can see the bug even if they are not members of all 
-        # groups to which the bug is restricted.
-        if (%buggroups) {
-            $bug{'inagroup'} = 1;
-
-            # Determine whether or not the bug is always accessible by the
-            # reporter, QA contact, and/or users on the cc: list.
-            SendSQL("SELECT reporter_accessible, cclist_accessible
-                     FROM   bugs
-                     WHERE  bug_id = $id
-                    ");
-            ($bug{'reporter_accessible'}, 
-             $bug{'cclist_accessible'}) = FetchSQLData();        
-        }
-    }
-    $vars->{'groups'} = \@groups;
-
-    my $movers = Param("movers");
-    $user{'canmove'} = Param("move-enabled") 
-                       && (defined $::COOKIE{"Bugzilla_login"}) 
-                       && ($::COOKIE{"Bugzilla_login"} =~ /\Q$movers\E/);
-
-    # User permissions
-
-    # In the below, if the person hasn't logged in ($::userid == 0), then
-    # we treat them as if they can do anything.  That's because we don't
-    # know why they haven't logged in; it may just be because they don't
-    # use cookies.  Display everything as if they have all the permissions
-    # in the world; their permissions will get checked when they log in
-    # and actually try to make the change.
-    $user{'canedit'} = $::userid == 0
-                       || $::userid == $bug{'reporter'}
-                       || $::userid == $bug{'qa_contact'}
-                       || $::userid == $bug{'assigned_to'}
-                       || UserInGroup($userid, "editbugs");                   
-    $user{'canconfirm'} = ($::userid == 0) || UserInGroup($userid, "canconfirm");
-
-    # Bug states
-    $bug{'isunconfirmed'} = ($bug{'bug_status'} eq $::unconfirmedstate);
-    $bug{'isopened'} = IsOpenedState($bug{'bug_status'});
-
-    # People involved with the bug
-    $bug{'assigned_to_email'} = DBID_to_name($bug{'assigned_to'});
-    $bug{'assigned_to'} = DBID_to_real_or_loginname($bug{'assigned_to'});
-    $bug{'reporter'} = DBID_to_real_or_loginname($bug{'reporter'});
-    $bug{'qa_contact'} = $bug{'qa_contact'} > 0 ? 
-                                          DBID_to_name($bug{'qa_contact'}) : "";
-
-    my $ccset = new RelationSet;
-    $ccset->mergeFromDB("SELECT who FROM cc WHERE bug_id=$id");
-    
-    my @cc = $ccset->toArrayOfStrings();
-    $bug{'cc'} = \@cc if $cc[0];
-
-    # Next bug in list (if there is one)
-    my @bug_list;
-    if ($::COOKIE{"BUGLIST"} && $id) 
-    {
-        @bug_list = split(/:/, $::COOKIE{"BUGLIST"});
-    }
-    $vars->{'bug_list'} = \@bug_list;
-
-    $bug{'comments'} = GetComments($bug{'bug_id'});
-
-    # This is length in number of comments
-    $bug{'longdesclength'} = scalar(@{$bug{'comments'}});
-
-    # Add the bug and user hashes to the variables
-    $vars->{'bug'} = \%bug;
-    $vars->{'user'} = \%user;
-
-    # Generate and return the UI (HTML page) from the appropriate template.
-    $template->process("bug/edit.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-}
- 
-1;

mozilla/webtools/bugzilla/bug_status.html

@@ -1,206 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-
-<!--
-     The contents of this file are subject to the Mozilla 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/MPL/
-    
-     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 the Bugzilla Bug Tracking System.
-    
-     The Initial Developer of the Original Code is Netscape Communications
-     Corporation. Portions created by Netscape are
-     Copyright (C) 1998 Netscape Communications Corporation. All
-     Rights Reserved.
-    
-     Contributor(s): 
-
-     Contributor(s): Terry Weissman <terry@mozilla.org>
--->
-
-<head>
-<TITLE>A Bug's Life Cycle</TITLE>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-<body>
-
-<h1 ALIGN=CENTER>A Bug's Life Cycle</h1>
-
-The <B>status</B> and <B>resolution</B> field define and track the
-life cycle of a bug.
-
-<a name="status"></a>
-<p>
-<TABLE BORDER=1 CELLPADDING=4>
-
-<TR ALIGN=CENTER VALIGN=TOP>
-<TD WIDTH="50%"><H1>STATUS</H1> <TD><H1>RESOLUTION</H1>
-
-<TR VALIGN=TOP>
-<TD>The <B>status</B> field indicates the general health of a bug. Only
-certain status transitions are allowed.
-<TD>The <b>resolution</b> field indicates what happened to this bug.
-
-<TR VALIGN=TOP><TD>
-<DL><DT><B>
-<A HREF="confirmhelp.html">UNCONFIRMED</A></B> 
-<DD> This bug has recently been added to the database.  Nobody has
-     validated that this bug is true.  Users who have the "canconfirm"
-     permission set may confirm this bug, changing its state to NEW.
-     Or, it may be directly resolved and marked RESOLVED.
-<DT><B>NEW</B> 
-<DD> This bug has recently been added to the assignee's list of bugs
-     and must be processed. Bugs in this state may be accepted, and
-     become <B>ASSIGNED</B>, passed on to someone else, and remain
-     <B>NEW</B>, or resolved and marked <B>RESOLVED</B>.
-<DT><B>ASSIGNED</B> 
-<DD> This bug is not yet resolved, but is assigned to the proper
-     person. From here bugs can be given to another person and become
-     <B>NEW</B>, or resolved and become <B>RESOLVED</B>.
-<DT><B>REOPENED</B>
-<DD>This bug was once resolved, but the resolution was deemed
-     incorrect.  For example, a <B>WORKSFORME</B> bug is
-     <B>REOPENED</B> when more information shows up and the bug is now
-     reproducible.  From here bugs are either marked <B>ASSIGNED</B>
-     or <B>RESOLVED</B>.
-</DL>
-<TD>
-<DL>
-<DD> No resolution yet. All bugs which are in one of these "open" states
-     have the resolution set to blank. All other bugs
-     will be marked with one of the following resolutions.
-</DL>
-
-<TR VALIGN=TOP><TD>
-<DL>
-<DT><B>RESOLVED</B> 
-<DD> A resolution has been taken, and it is awaiting verification by
-     QA. From here bugs are either re-opened and become
-     <B>REOPENED</B>, are marked <B>VERIFIED</B>, or are closed for good
-     and marked <B>CLOSED</B>.
-<DT><B>VERIFIED</B>
-<DD> QA has looked at the bug and the resolution and agrees that the
-     appropriate resolution has been taken.  Bugs remain in this state
-     until the product they were reported against actually ships, at
-     which point they become <B>CLOSED</B>.
-<DT><B>CLOSED</B> 
-<DD> The bug is considered dead, the resolution is correct. Any zombie
-     bugs who choose to walk the earth again must do so by becoming
-     <B>REOPENED</B>.
-</DL>
-
-<TD>
-<DL>
-<DT><B>FIXED</B>
-<DD> A fix for this bug is checked into the tree and tested.
-<DT><B>INVALID</B>
-<DD> The problem described is not a bug 
-<DT><B>WONTFIX</B>
-<DD> The problem described is a bug which will never be fixed.
-<DT><B>LATER</B>
-<DD> The problem described is a bug which will not be fixed in this
-     version of the product.
-<DT><B>REMIND</B>
-<DD> The problem described is a bug which will probably not be fixed in this
-     version of the product, but might still be.
-<DT><B>DUPLICATE</B>
-<DD> The problem is a duplicate of an existing bug. Marking a bug
-     duplicate requires the bug# of the duplicating bug and will at
-     least put that bug number in the description field.
-<DT><B>WORKSFORME</B>
-<DD> All attempts at reproducing this bug were futile, reading the
-     code produces no clues as to why this behavior would occur. If
-     more information appears later, please re-assign the bug, for
-     now, file it.
-</DL>
-</TABLE>
-
-<H1>Other Fields</H1>
-
-<table border=1 cellpadding=4><tr><td>
-<h2><a name="severity">Severity</a></h2>
-
-This field describes the impact of a bug.
-
-<p>
-<p>
- 
-<table>
-<tr><th>Blocker</th><td>Blocks development and/or testing work
-<tr><th>Critical</th><td>crashes, loss of data, severe memory leak 
-<tr><th>Major</th><td>major loss of function 
-<tr><th>Minor</th><td>minor loss of function, or other problem where easy workaround is present 
-<tr><th>Trivial</th><td>cosmetic problem like misspelled words or misaligned text 
-<tr><th>Enhancement</th><td>Request for enhancement
-</table> 
-
-</td><td>
-
-<h2><a name="priority">Priority</a></h2>
-
-This field describes the importance and order in which a bug should be
-fixed.  This field is utilized by the programmers/engineers to
-prioritize their work to be done.  The available priorities are:
-
-<p>
-<p>
-
-<table>
-<tr><th>P1</th><td>Most important
-<tr><th>P2</th><td>
-<tr><th>P3</th><td>
-<tr><th>P4</th><td>
-<tr><th>P5</th><td>Least important
-</table>
-</tr></table>
-
-<h2><a name="rep_platform">Platform</a></h2>
-This is the hardware platform against which the bug was reported.  Legal
-platforms include:
-
-<UL>
-<LI> All (happens on all platform; cross-platform bug)
-<LI> Macintosh
-<LI> PC
-<LI> Sun
-<LI> HP
-</UL>
-
-<b>Note:</b> Selecting the option "All" does not select bugs assigned against all platforms.  It
-merely selects bugs that <b>occur</b> on all platforms.
-
-<h2><a name="op_sys">Operating System</a></h2>
-This is the operating system against which the bug was reported.  Legal
-operating systems include:
-
-<UL>
-<LI> All (happens on all operating systems; cross-platform bug)
-<LI> Windows 95
-<LI> Mac System 8.0
-<LI> Linux
-</UL>
-
-Note that the operating system implies the platform, but not always.
-For example, Linux can run on PC and Macintosh and others.
-
-<h2><a name="assigned_to">Assigned To</a></h2>
-
-This is the person in charge of resolving the bug.  Every time this
-field changes, the status changes to <B>NEW</B> to make it easy to see
-which new bugs have appeared on a person's list.
-
-The default status for queries is set to NEW, ASSIGNED and REOPENED. When
-searching for bugs that have been resolved or verified, remember to set the
-status field appropriately. 
-
-<hr>
-<!-- hhmts start -->
-Last modified: Sun Apr 14 12:51:23 EST 2002
-<!-- hhmts end -->
-</body> </html>

mozilla/webtools/bugzilla/bugwritinghelp.html

@@ -1,392 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-<title>Bug Writing Guidelines</title>
-</head>
-<body>
-<center>
-<h1>Bug Writing Guidelines</h1>
-</center>
-
-<h3>Why You Should Read This</h3>
-
-<blockquote>
-<p>Simply put, the more effectively you report a bug, the more
-likely an engineer will actually fix it.</p>
-
-<p>These guidelines are a general
-tutorial to teach novice and intermediate bug reporters how to compose effective bug reports. Not every sentence may precisely apply to
-your software project.</p>
-</blockquote>
-
-<h3>How to Write a Useful Bug Report</h3>
-
-<blockquote>
-<p>Useful bug reports are ones that get bugs fixed. A useful bug
-report normally has two qualities:</p>
-
-<ol>
-<li><b>Reproducible.</b> If an engineer can't see the bug herself to prove that it exists, she'll probably stamp your bug report "WORKSFORME" or "INVALID" and move on to the next bug. Every detail you can provide helps.<br>
-<br>
-</li>
-
-<li><b>Specific.</b> The quicker the engineer can isolate the bug
-to a specific area, the more likely she'll expediently fix it. 
-(If a programmer or tester has to decypher a bug, they may spend
-more time cursing the submitter than solving the problem.)
-<br>
-<br>
-[ <a href="#tips" name="Anchor">Tell Me More</a> ]
-</li>
-</ol>
-
-<p>Let's say the application you're testing is a web browser. You
-crash at foo.com, and want to write up a bug report:</p>
-
-<blockquote>
-<p><b>BAD:</b> "My browser crashed. I think I was on www.foo.com. I play golf with Bill Gates, so you better fix this problem, or I'll report you to him. By the way, your Back icon looks like a squashed rodent. UGGGLY. And my grandmother's home page is all messed up in your browser. Thx 4 UR help."
-</p>
-
-<p>
- <b>GOOD:</b> "I crashed each time I went to www.foo.com, using
-the 2002-02-25 build on a Windows 2000 system. I also
-rebooted into Linux, and reproduced this problem using the 2002-02-24
-Linux build.
-</p>
-
-<p>
- It again crashed each time upon drawing the Foo banner at the top
-of the page. I broke apart the page, and discovered that the
-following image link will crash the application reproducibly,
-unless you remove the "border=0" attribute:
-</p>
-
-<p>
- <tt>&lt;IMG SRC="http://www.foo.com/images/topics/topicfoos.gif"
-width="34" height="44" border="0" alt="News"&gt;</tt>
-</p>
-</blockquote>
-</blockquote>
-
-<h3>How to Enter your Useful Bug Report into Bugzilla:</h3>
-
-<blockquote>
-<p>Before you enter your bug, use Bugzilla's 
-<a href="query.cgi">search page</a> to determine whether the defect you've discovered is a known, already-reported bug. If your bug is the 37th duplicate of a known issue, you're more likely to annoy the engineer. (Annoyed
-engineers fix fewer bugs.)
-</p>
-
-<p>
-Next, be sure to reproduce your bug using a recent
-build. Engineers tend to be most interested in problems affecting
-the code base that they're actively working on. After all, the bug you're reporting
-may already be fixed.
-
-</p>
-
-<p>
- If you've discovered a new bug using a current build, report it in
-Bugzilla:
-</p>
-
-<ol>
-<li>From your Bugzilla main page, choose 
-"<a href="enter_bug.cgi">Enter a new bug</a>".</li>
-
-<li>Select the product that you've found a bug in.</li>
-
-<li>Enter your e-mail address, password, and press the "Login"
-button. (If you don't yet have a password, leave the password field empty, 
-and press the "E-mail me a password" button instead.
-You'll quickly receive an e-mail message with your password.)</li>
-</ol>
-
-<p>Now, fill out the form. Here's what it all means:</p>
-
-<p><b>Where did you find the bug?</b></p>
-
-<blockquote>
-<p><b>Product: In which product did you find the bug?</b><br>
- You just specified this on the last page, so you can't edit it here.</p>
-
-<p><b>Version: In which product version did you find the
-bug?</b><br>
- (If applicable)</p>
-
-<p><b>Component: In which component does the bug exist?</b><br>
-Bugzilla requires that you select a component to enter a bug. (Not sure which to choose? 
-Click on the Component link. You'll see a description of each component, to help you make the best choice.)</p>
-
-<p><b>OS: On which Operating System (OS) did you find this bug?</b>
-(e.g. Linux, Windows 2000, Mac OS 9.)<br>
- If you know the bug happens on all OSs, choose 'All'. Otherwise,
-select the OS that you found the bug on, or "Other" if your OS
-isn't listed.</p>
-</blockquote>
-
-<p><b>How important is the bug?</b></p>
-
-<blockquote>
-<p><b>Severity: How damaging is the bug?</b><br>
- This item defaults to 'normal'. If you're not sure what severity your bug deserves, click on the Severity link.
- You'll see a description of each severity rating. <br>
-</p>
-</blockquote>
-
-<p><b>Who will be following up on the bug?</b></p>
-
-<blockquote>
-<p><b>Assigned To: Which engineer should be responsible for fixing
-this bug?</b><br>
- Bugzilla will automatically assign the bug to a default engineer
-upon submitting a bug report. If you'd prefer to directly assign the bug to
-someone else, enter their e-mail address into this field. (To see the list of
-default engineers for each component, click on the Component
-link.)</p>
-
-<p><b>Cc: Who else should receive e-mail updates on changes to this
-bug?</b><br>
- List the full e-mail addresses of other individuals who should
-receive an e-mail update upon every change to the bug report. You
-can enter as many e-mail addresses as you'd like, separated by spaces or commas, as long as those
-people have Bugzilla accounts.</p>
-</blockquote>
-
-<p><b>What else can you tell the engineer about the bug?</b></p>
-
-<blockquote>
-
-<p><b>Summary:</b> <b>How would you describe the bug, in
-approximately 60 or fewer characters?</b><br>
- A good summary should <b>quickly and uniquely identify a bug
-report</b>. Otherwise, an engineer cannot meaningfully identify
-your bug by its summary, and will often fail to pay attention to
-your bug report when skimming through a 10 page bug list.<br>
-<br>
- A useful summary might be 
- "<tt>PCMCIA install fails on Tosh Tecra 780DVD w/ 3c589C</tt>". 
- "<tt>Software fails</tt>" or "<tt>install problem</tt>" would be
-examples of a bad summary.<br>
-<br>
- [ <a href="#summary">Tell Me More</a> ]<br>
-<br>
- <b>Description: </b><br>
- Please provide a detailed problem report in this field.
-Your bug's recipients will most likely expect the following information:</p>
-
-<blockquote>
-<p><b>Overview Description:</b> More detailed expansion of
-summary.</p>
-
-<blockquote>
-<pre>
-Drag-selecting any page crashes Mac builds in NSGetFactory
-</pre>
-</blockquote>
-
-<p><b>Steps to Reproduce:</b> Minimized, easy-to-follow steps that will
-trigger the bug. Include any special setup steps.</p>
-
-<blockquote>
-<pre>
-1) View any web page. (I used the default sample page,
-resource:/res/samples/test0.html)
-                          
-2) Drag-select the page. (Specifically, while holding down 
-the mouse button, drag the mouse pointer downwards from any 
-point in the browser's content region to the bottom of the 
-browser's content region.)                   
-</pre>
-</blockquote>
-
-<p>
- <b>Actual Results:</b> What the application did after performing
-the above steps. 
-</p>
-
-<blockquote>
-<pre>
-The application crashed. Stack crawl appended below from MacsBug.
-</pre>
-</blockquote>
-
-<p><b>Expected Results:</b> What the application should have done,
-were the bug not present.</p>
-
-<blockquote>
-<pre>
-The window should scroll downwards. Scrolled content should be selected. 
-(Or, at least, the application should not crash.)
-</pre>
-</blockquote>
-
-<p><b>Build Date &amp; Platform:</b> Date and platform of the build
-that you first encountered the bug in.</p>
-
-<blockquote>
-<pre>
-Build 2002-03-15 on Mac OS 9.0
-</pre>
-</blockquote>
-
-<p><b>Additional Builds and Platforms:</b> Whether or not the bug
-takes place on other platforms (or browsers, if applicable).</p>
-
-<blockquote>
-<pre>
-- Also Occurs On        
-    Mozilla (2002-03-15 build on Windows NT 4.0) 
-                                    
-- Doesn't Occur On        
-    Mozilla (2002-03-15 build on Red Hat Linux; feature not supported)        
-    Internet Explorer 5.0 (shipping build on Windows NT 4.0)        
-    Netscape Communicator 4.5 (shipping build on Mac OS 9.0)
-</pre>
-</blockquote>
-
-<p><b>Additional Information:</b> Any other debugging information.
-For crashing bugs:</p>
-
-<ul>
-<li><b>Win32:</b> if you receive a Dr. Watson error, please note
-the type of the crash, and the module that the application crashed
-in. (e.g. access violation in apprunner.exe)</li>
-
-<li><b>Mac OS:</b> if you're running MacsBug, please provide the
-results of a <b>how</b> and an <b>sc</b>:</li>
-</ul>
-
-<blockquote>
-<pre>
-*** MACSBUG STACK CRAWL OF CRASH (Mac OS)
-Calling chain using A6/R1 links 
-    Back chain  ISA  Caller 
-    00000000    PPC  0BA85E74   
-    03AEFD80    PPC  0B742248   
-    03AEFD30    PPC  0B50FDDC  NSGetFactory+027FC
-PowerPC unmapped memory exception at 0B512BD0 NSGetFactory+055F0
-</pre>
-</blockquote>
-</blockquote>
-</blockquote>
-
-<p>You're done!<br>
-<br>
- After double-checking your entries for any possible errors, press
-the "Commit" button, and your bug report will now be in the
-Bugzilla database.<br>
-</p>
-</blockquote>
-
-<hr>
-<h3>More Information on Writing Good Bugs</h3>
-
-<blockquote>
-<p><b><a name="tips"></a> 1. General Tips for a Useful Bug
-Report</b>
-</p>
-
-<blockquote>
-<p>
- <b>Use an explicit structure, so your bug reports are easy to
-skim.</b> Bug report users often need immediate access to specific
-sections of your bug. If your Bugzilla installation supports the
-Bugzilla Helper, use it.
-</p>
-
-<p>
- <b>Avoid cuteness if it costs clarity.</b> Nobody will be laughing
-at your funny bug title at 3:00 AM when they can't remember how to
-find your bug.
-</p>
-
-<p>
- <b>One bug per report.</b> Completely different people typically
-fix, verify, and prioritize different bugs. If you mix a handful of
-bugs into a single report, the right people probably won't discover
-your bugs in a timely fashion, or at all. Certain bugs are also
-more important than others. It's impossible to prioritize a bug
-report when it contains four different issues, all of differing
-importance.
-</p>
-
-<p>
- <b>No bug is too trivial to report.</b> Unless you're reading the
-source code, you can't see actual software bugs, like a dangling
-pointer -- you'll see their visible manifestations, such as the
-segfault when the application finally crashes. Severe software
-problems can manifest themselves in superficially trivial ways.
-File them anyway.<br>
-</p>
-</blockquote>
-
-<p><b><a name="summary"></a>2. How and Why to Write Good Bug Summaries</b>
-</p>
-
-<blockquote>
-<p><b>You want to make a good first impression on the bug
-recipient.</b> Just like a New York Times headline guides readers
-towards a relevant article from dozens of choices, will your bug summary
-suggest that your bug report is worth reading from dozens or hundreds of
-choices?
-</p>
-
-<p>
- Conversely, a vague bug summary like <tt>install problem</tt> forces anyone
-reviewing installation bugs to waste time opening up your bug to
-determine whether it matters.
-</p>
-
-<p>
- <b>Your bug will often be searched by its summary.</b> Just as
-you'd find web pages with Google by searching by keywords through
-intuition, so will other people locate your bugs. Descriptive bug
-summaries are naturally keyword-rich, and easier to find.
-</p>
-
-<p>
- For example, you'll find a bug titled "<tt>Dragging icons from List View to
-gnome-terminal doesn't paste path</tt>" if you search on "List",
-"terminal", or "path". Those search keywords wouldn't have found a
-bug titled "<tt>Dragging icons
-doesn't paste</tt>".
-</p>
-
-<p>
- Ask yourself, "Would someone understand my bug from just this
-summary?" If so, you've written a fine summary.
-</p>
-
-<p><b>Don't write titles like these:</b></p>
-
-<ol>
- <li>"Can't install" - Why can't you install? What happens when you
-try to install?</li>
-<li>"Severe Performance Problems" - ...and they occur when you do
-what?</li>
-<li>"back button does not work" - Ever? At all?</li>
-</ol>
-
-<p><b>Good bug titles:</b></p>
-<ol>
-<li>"1.0 upgrade installation fails if Mozilla M18 package present"
-- Explains problem and the context.</li>
-<li>"RPM 4 installer crashes if launched on Red Hat 6.2 (RPM 3)
-system" - Explains what happens, and the context.</li>
-</ol>
-
-
-
-</blockquote>
-</blockquote>
-
-<p>(Written and maintained by 
-<a href="http://www.prometheus-music.com/eli">Eli Goldberg</a>. Claudius
-Gayle, Gervase Markham, Peter Mock, Chris Pratt, Tom Schutter and Chris Yeh also
-contributed significant changes. Constructive 
-<a href="mailto:eli@prometheus-music.com">suggestions</a> welcome.)</p>
-
-</body>
-</html>
-

mozilla/webtools/bugzilla/bugzilla.dtd

@@ -1,46 +0,0 @@
-<!ELEMENT bugzilla (bug+)>
-<!ATTLIST bugzilla
-	version CDATA #REQUIRED
-	urlbase CDATA #REQUIRED
-	maintainer CDATA #REQUIRED
-	exporter CDATA #IMPLIED
->
-<!ELEMENT bug (bug_id, (bug_status, product, priority, version, rep_platform, assigned_to, delta_ts, component, reporter, target_milestone?, bug_severity, creation_ts, qa_contact?, op_sys, resolution?, bug_file_loc?, short_desc?, keywords*, status_whiteboard?, dependson*, blocks*, cc*, long_desc*, attachment*)?)>
-<!ATTLIST bug
-	error (NotFound | NotPermitted | InvalidBugId) #IMPLIED
->
-<!ELEMENT bug_id (#PCDATA)>
-<!ELEMENT exporter (#PCDATA)>
-<!ELEMENT urlbase (#PCDATA)>
-<!ELEMENT bug_status (#PCDATA)>
-<!ELEMENT product (#PCDATA)>
-<!ELEMENT priority (#PCDATA)>
-<!ELEMENT version (#PCDATA)>
-<!ELEMENT rep_platform (#PCDATA)>
-<!ELEMENT assigned_to (#PCDATA)>
-<!ELEMENT delta_ts (#PCDATA)>
-<!ELEMENT component (#PCDATA)>
-<!ELEMENT reporter (#PCDATA)>
-<!ELEMENT target_milestone (#PCDATA)>
-<!ELEMENT bug_severity (#PCDATA)>
-<!ELEMENT creation_ts (#PCDATA)>
-<!ELEMENT qa_contact (#PCDATA)>
-<!ELEMENT status_whiteboard (#PCDATA)>
-<!ELEMENT op_sys (#PCDATA)>
-<!ELEMENT resolution (#PCDATA)>
-<!ELEMENT bug_file_loc (#PCDATA)>
-<!ELEMENT short_desc (#PCDATA)>
-<!ELEMENT keywords (#PCDATA)>
-<!ELEMENT dependson (#PCDATA)>
-<!ELEMENT blocks (#PCDATA)>
-<!ELEMENT cc (#PCDATA)>
-<!ELEMENT long_desc (who, bug_when, thetext)>
-<!ELEMENT who (#PCDATA)>
-<!ELEMENT bug_when (#PCDATA)>
-<!ELEMENT thetext (#PCDATA)>
-<!ELEMENT attachment (attachid, date, desc, type?, data?)>
-<!ELEMENT attachid (#PCDATA)>
-<!ELEMENT date (#PCDATA)>
-<!ELEMENT desc (#PCDATA)>
-<!ELEMENT type (#PCDATA)>
-<!ELEMENT data (#PCDATA)>

mozilla/webtools/bugzilla/changepassword.cgi

@@ -1,39 +0,0 @@
-#!/usr/bonsaitools/bin/perl -wT
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-#
-# 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 the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-
-use strict;
-
-print q{Content-type: text/html
-
-<HTML>
-<HEAD>
-<META HTTP-EQUIV="Refresh"
-  CONTENT="0; URL=userprefs.cgi">
-</HEAD>
-<BODY>
-This URL is obsolete.  Forwarding you to the correct one.
-<P>
-Going to <A HREF="userprefs.cgi">userprefs.cgi</A>
-<BR>
-</BODY>
-</HTML>
-}

mozilla/webtools/bugzilla/colchange.cgi

@@ -1,156 +0,0 @@
-#!/usr/bonsaitools/bin/perl -wT
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-#
-# 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 the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-
-use diagnostics;
-use strict;
-
-use lib qw(.);
-
-use vars qw(
-  @legal_keywords
-  $buffer
-  $template
-  $vars
-);
-
-require "CGI.pl";
-
-# Use the template toolkit (http://www.template-toolkit.org/) to generate
-# the user interface (HTML pages and mail messages) using templates in the
-# "template/" subdirectory.
-use Template;
-
-# Create the global template object that processes templates and specify
-# configuration parameters that apply to all templates processed in this script.
-my $template = Template->new(
-{
-    # Colon-separated list of directories containing templates.
-    INCLUDE_PATH => "template/custom:template/default",
-    # Allow templates to be specified with relative paths.
-    RELATIVE => 1,
-    PRE_CHOMP => 1,
-});
-
-# Define the global variables and functions that will be passed to the UI 
-# template.  Individual functions add their own values to this hash before
-# sending them to the templates they process.
-my $vars = 
-{
-    # Function for retrieving global parameters.
-    'Param' => \&Param, 
-
-    # Function for processing global parameters that contain references
-    # to other global parameters.
-    'PerformSubsts' => \&PerformSubsts,
-
-    # Function to search an array for a value   
-    'lsearch' => \&lsearch,
-};
-
-print "Content-type: text/html\n";
-
-# The master list not only says what fields are possible, but what order
-# they get displayed in.
-
-ConnectToDatabase();
-GetVersionTable();
-
-my @masterlist = ("opendate", "changeddate", "severity", "priority",
-                  "platform", "owner", "reporter", "status", "resolution",
-                  "product", "component", "version", "os", "votes");
-
-if (Param("usetargetmilestone")) {
-    push(@masterlist, "target_milestone");
-}
-if (Param("useqacontact")) {
-    push(@masterlist, "qa_contact");
-}
-if (Param("usestatuswhiteboard")) {
-    push(@masterlist, "status_whiteboard");
-}
-if (@::legal_keywords) {
-    push(@masterlist, "keywords");
-}
-
-
-push(@masterlist, ("summary", "summaryfull"));
-
-$vars->{masterlist} = \@masterlist;
-
-my @collist;
-if (defined $::FORM{'rememberedquery'}) {
-    my $splitheader = 0;
-    if (defined $::FORM{'resetit'}) {
-        @collist = @::default_column_list;
-    } else {
-        foreach my $i (@masterlist) {
-            if (defined $::FORM{"column_$i"}) {
-                push @collist, $i;
-            }
-        }
-        if (exists $::FORM{'splitheader'}) {
-            $splitheader = $::FORM{'splitheader'};
-        }
-    }
-    my $list = join(" ", @collist);
-    my $urlbase = Param("urlbase");
-    my $cookiepath = Param("cookiepath");
-    print "Set-Cookie: COLUMNLIST=$list ; path=$cookiepath ; expires=Sun, 30-Jun-2029 00:00:00 GMT\n";
-    print "Set-Cookie: SPLITHEADER=$::FORM{'splitheader'} ; path=$cookiepath ; expires=Sun, 30-Jun-2029 00:00:00 GMT\n";
-    print "Refresh: 0; URL=buglist.cgi?$::FORM{'rememberedquery'}\n";
-    print "\n";
-    print "<META HTTP-EQUIV=Refresh CONTENT=\"1; URL=$urlbase"."buglist.cgi?$::FORM{'rememberedquery'}\">\n";
-    print "<TITLE>What a hack.</TITLE>\n";
-    PutHeader ("Change columns");
-    print "Resubmitting your query with new columns...\n";
-    exit;
-}
-
-if (defined $::COOKIE{'COLUMNLIST'}) {
-    @collist = split(/ /, $::COOKIE{'COLUMNLIST'});
-} else {
-    @collist = @::default_column_list;
-}
-
-$vars->{collist} = \@collist;
-
-$vars->{splitheader} = 0;
-if ($::COOKIE{'SPLITHEADER'}) {
-    $vars->{splitheader} = 1;
-}
-
-my %desc = ();
-foreach my $i (@masterlist) {
-    $desc{$i} = $i;
-}
-
-$desc{'summary'} = "Summary (first 60 characters)";
-$desc{'summaryfull'} = "Full Summary";
-
-$vars->{desc} = \%desc;
-$vars->{buffer} = $::buffer;
-
-# Generate and return the UI (HTML page) from the appropriate template.
-print "Content-type: text/html\n\n";
-$template->process("list/change-columns.html.tmpl", $vars)
-  || ThrowTemplateError($template->error());
-

mozilla/webtools/bugzilla/collectstats.pl

@@ -1,202 +0,0 @@
-#!/usr/bonsaitools/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-#
-# 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 the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>,
-#                 Harrison Page <harrison@netscape.com>
-#         Gervase Markham <gerv@gerv.net>
-
-# Run me out of cron at midnight to collect Bugzilla statistics.
-
-
-use AnyDBM_File;
-use diagnostics;
-use strict;
-use vars @::legal_product;
-
-require "globals.pl";
-
-# tidy up after graphing module
-if (chdir("graphs")) {
-    unlink <./*.gif>;
-    unlink <./*.png>;
-    chdir("..");
-}
-
-ConnectToDatabase(1);
-GetVersionTable();
-
-my @myproducts;
-push( @myproducts, "-All-", @::legal_product );
-
-foreach (@myproducts) {
-    my $dir = "data/mining";
-
-    &check_data_dir ($dir);
-    &collect_stats ($dir, $_);
-}
-
-&calculate_dupes();
-
-sub check_data_dir {
-    my $dir = shift;
-
-    if (! -d) {
-        mkdir $dir, 0777;
-        chmod 0777, $dir;
-    }
-}
-
-sub collect_stats {
-    my $dir = shift;
-    my $product = shift;
-    my $when = localtime (time);
-
-    # NB: Need to mangle the product for the filename, but use the real
-    # product name in the query
-    my $file_product = $product;
-    $file_product =~ s/\//-/gs;
-    my $file = join '/', $dir, $file_product;
-    my $exists = -f $file;
-
-    if (open DATA, ">>$file") {
-        push my @row, &today;
-
-        foreach my $status ('NEW', 'ASSIGNED', 'REOPENED', 'UNCONFIRMED', 'RESOLVED', 'VERIFIED', 'CLOSED') {
-            if( $product eq "-All-" ) {
-                SendSQL("select count(bug_status) from bugs where bug_status='$status'");
-            } else {
-                SendSQL("select count(bug_status) from bugs where bug_status='$status' and product='$product'");
-            }
-
-            push @row, FetchOneColumn();
-        }
-
-        foreach my $resolution ('FIXED', 'INVALID', 'WONTFIX', 'LATER', 'REMIND', 'DUPLICATE', 'WORKSFORME', 'MOVED') {
-            if( $product eq "-All-" ) {
-                SendSQL("select count(resolution) from bugs where resolution='$resolution'");
-            } else {
-                SendSQL("select count(resolution) from bugs where resolution='$resolution' and product='$product'");
-            }
-
-            push @row, FetchOneColumn();
-        }
-
-        if (! $exists) {
-            print DATA <<FIN;
-# Bugzilla Daily Bug Stats
-#
-# Do not edit me! This file is generated.
-#
-# fields: DATE|NEW|ASSIGNED|REOPENED|UNCONFIRMED|RESOLVED|VERIFIED|CLOSED|FIXED|INVALID|WONTFIX|LATER|REMIND|DUPLICATE|WORKSFORME|MOVED
-# Product: $product
-# Created: $when
-FIN
-        }
-
-        print DATA (join '|', @row) . "\n";
-        close DATA;
-    } else {
-        print "$0: $file, $!";
-    }
-}
-
-sub calculate_dupes {
-    SendSQL("SELECT * FROM duplicates");
-
-    my %dupes;
-    my %count;
-    my @row;
-    my $key;
-    my $changed = 1;
-
-    my $today = &today_dash;
-
-    # Save % count here in a date-named file
-    # so we can read it back in to do changed counters
-    # First, delete it if it exists, so we don't add to the contents of an old file
-    if (my @files = <data/duplicates/dupes$today*>) {
-        unlink @files;
-    }
-   
-    dbmopen(%count, "data/duplicates/dupes$today", 0644) || die "Can't open DBM dupes file: $!";
-
-    # Create a hash with key "a bug number", value "bug which that bug is a
-    # direct dupe of" - straight from the duplicates table.
-    while (@row = FetchSQLData()) {
-        my $dupe_of = shift @row;
-        my $dupe = shift @row;
-        $dupes{$dupe} = $dupe_of;
-    }
-
-    # Total up the number of bugs which are dupes of a given bug
-    # count will then have key = "bug number", 
-    # value = "number of immediate dupes of that bug".
-    foreach $key (keys(%dupes)) 
-    {
-        my $dupe_of = $dupes{$key};
-
-        if (!defined($count{$dupe_of})) {
-            $count{$dupe_of} = 0;
-        }
-
-        $count{$dupe_of}++;
-    }   
-
-    # Now we collapse the dupe tree by iterating over %count until
-    # there is no further change.
-    while ($changed == 1)
-    {
-        $changed = 0;
-        foreach $key (keys(%count)) {
-            # if this bug is actually itself a dupe, and has a count...
-            if (defined($dupes{$key}) && $count{$key} > 0) {
-                # add that count onto the bug it is a dupe of,
-                # and zero the count; the check is to avoid
-                # loops
-                if ($count{$dupes{$key}} != 0) {
-                    $count{$dupes{$key}} += $count{$key};
-                    $count{$key} = 0;
-                    $changed = 1;
-                }
-            }
-        }
-    }
-
-    # Remove the values for which the count is zero
-    foreach $key (keys(%count))
-    {
-        if ($count{$key} == 0) {
-            delete $count{$key};
-        }
-    }
-   
-    dbmclose(%count);
-}
-
-sub today {
-    my ($dom, $mon, $year) = (localtime(time))[3, 4, 5];
-    return sprintf "%04d%02d%02d", 1900 + $year, ++$mon, $dom;
-}
-
-sub today_dash {
-    my ($dom, $mon, $year) = (localtime(time))[3, 4, 5];
-    return sprintf "%04d-%02d-%02d", 1900 + $year, ++$mon, $dom;
-}
-

mozilla/webtools/bugzilla/confirmhelp.html

@@ -1,168 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html><head>
-
-<!--
-     The contents of this file are subject to the Mozilla 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/MPL/
-    
-     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 the Bugzilla Bug Tracking System.
-    
-     The Initial Developer of the Original Code is Netscape Communications
-     Corporation. Portions created by Netscape are
-     Copyright (C) 2000 Netscape Communications Corporation. All
-     Rights Reserved.
-    
-     Contributor(s): Terry Weissman <terry@mozilla.org>
--->
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Understanding the UNCONFIRMED state, and other recent changes</title>
-</head>
-
-<body>
-<h1>Understanding the UNCONFIRMED state, and other recent changes</h1>
-
-<p>
-[This document is aimed primarily at people who have used Bugzilla
-before the UNCONFIRMED state was implemented.  It might be helpful for
-newer users as well.]
-</p>
-
-<p>
-
-New bugs in some products will now show up in a new state,
-UNCONFIRMED.  This means that we have nobody has confirmed that the
-bug is real.  Very busy engineers will probably generally ignore
-UNCONFIRMED that have been assigned to them, until they have been
-confirmed in one way or another.  (Engineers with more time will
-hopefully glance over their UNCONFIRMED bugs regularly.)
-</p>
-
-<p>
-The <a href="bug_status.html">page describing bug fields</a> has been
-updated to include UNCONFIRMED.
-</p>
-
-<p>
-There are two basic ways that a bug can become confirmed (and enter
-the NEW) state.
-</p>
-
-<ul>
-  <li> A user with the appropriate permissions (see below for more on
-       permissions) decides that the bug is a valid one, and confirms
-       it.  We hope to gather a small army of responsible volunteers
-       to regularly go through bugs for us.</li>
-  <li> The bug gathers a certain number of votes. <b>Any</b> valid Bugzilla user may vote for 
-bugs (each user gets a certain number of bugs); any UNCONFIRMED bug which 
-gets enough votes becomes automatically confirmed, and enters the NEW state.</li>
-</ul>
-
-<p>
-One implication of this is that it is worth your time to search the
-bug system for duplicates of your bug to vote on them, before
-submitting your own bug.  If we can spread around knowledge of this
-fact, it ought to help cut down the number of duplicate bugs in the
-system. 
-</p>
-
-<h2>Permissions.</h2>
-
-<p>
-Users now have a certain set of permissions.  To see your permissions,
-check out the
-<a href="userprefs.cgi?bank=permissions">user preferences</a> page.
-</p>
-
-<p>
-If you have the "Can confirm a bug" permission, then you will be able
-to move UNCONFIRMED bugs into the NEW state.
-</p>
-
-<p>
-If you have the "Can edit all aspects of any bug" permission, then you
-can tweak anything about any bug.  If not, you may only edit those
-bugs that you have submitted, or that you have assigned to you (or
-qa-assigned to you).  However, anyone may add a comment to any bug.
-</p>
-
-<p>
-Some people (initially, the initial owners and initial qa-contacts for
-components in the system) have the ability to give the above two
-permissions to other people.  So, if you really feel that you ought to
-have one of these permissions, a good person to ask (via private
-email, please!) is the person who is assigned a relevant bug.
-</p>
-
-<h2>Other details.</h2>
-
-<p>
-An initial stab was taken to decide who would be given which of the
-above permissions.  This was determined by some simple heurstics of
-who was assigned bugs, and who the default owners of bugs were, and a
-look at people who seem to have submitted several bugs that appear to
-have been interesting and valid.  Inevitably, we have failed to give
-someone the permissions they deserve.  Please don't take it
-personally; just bear with us as we shake out the new system.
-</p>
-
-<p>
-People with one of the two bits above can easily confirm their own
-bugs, so bugs they submit will actually start out in the NEW state.
-They can override this when submitting a bug.
-</p>
-
-<p>
-People can ACCEPT or RESOLVE a bug assigned to them, even if they
-aren't allowed to confirm it.  However, the system remembers, and if
-the bug gets REOPENED or reassigned to someone else, it will revert
-back to the UNCONFIRMED state.  If the bug has ever been confirmed,
-then REOPENing or reassigning will cause it to go to the NEW or
-REOPENED state.
-</p>
-
-<p>
-Note that only some products support the UNCONFIRMED state.  In other
-products, all new bugs will automatically start in the NEW state.
-</p>
-
-<h2>Things still to be done.</h2>
-
-<p>
-There probably ought to be a way to get a bug back into the
-UNCONFIRMED state, but there isn't yet.
-</p>
-
-<p>
-If a person has submitted several bugs that get confirmed, then this
-is probably a person who understands the system well, and deserves the
-"Can confirm a bug" permission.  This kind of person should be
-detected and promoted automatically.
-</p>
-
-<p>
-There should also be a way to automatically promote people to get the
-"Can edit all aspects of any bug" permission.
-</p>
-
-<p>
-The "enter a new bug" page needs to be revamped with easy ways for new
-people to educate themselves on the benefit of searching for a bug
-like the one they're about to submit and voting on it, rather than
-adding a new useless duplicate.
-</p>
-
-<hr>
-<p>
-<!-- hhmts start -->
-Last modified: Sun Apr 14 12:55:14 EST 2002
-<!-- hhmts end -->
-</p>
-</body> </html>

mozilla/webtools/bugzilla/contrib/BugzillaEmail.pm

@@ -1,79 +0,0 @@
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-
-# The contents of this file are subject to the Mozilla 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/MPL/
-#
-# 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.
-#
-# This code is based on code found in bug_email.pl from the bugzilla
-# email tracker.  Initial contributors are :: 
-#                 Terry Weissman <terry@mozilla.org>
-#                 Gregor Fischer <fischer@suse.de>
-#                 Klaas Freitag  <freitag@suse.de>
-#                 Seth Landsman  <seth@dworkin.net>
-
-# The purpose of this module is to abstract out a bunch of the code
-#  that is central to email interfaces to bugzilla and its database
-
-# Contributor : Seth Landsman <seth@dworkin.net>
-
-# Initial checkin : 03/15/00 (SML)
-#  findUser() function moved from bug_email.pl to here
-
-push @INC, "../."; # this script now lives in contrib
-
-require "globals.pl";
-
-use diagnostics;
-use strict;
-
-my $EMAIL_TRANSFORM_NONE = "email_transform_none";
-my $EMAIL_TRANSFORM_BASE_DOMAIN = "email_transform_base_domain";
-my $EMAIL_TRANSFORM_NAME_ONLY = "email_transform_name_only";
-
-# change to do incoming email address fuzzy matching
-my $email_transform = $EMAIL_TRANSFORM_NAME_ONLY;
-
-# findUser()
-# This function takes an email address and returns the user email.
-# matching is sloppy based on the $email_transform parameter
-sub findUser($) {
-  my ($address) = @_;
-  # if $email_transform is $EMAIL_TRANSFORM_NONE, return the address, otherwise, return undef
-  if ($email_transform eq $EMAIL_TRANSFORM_NONE) {
-    my $stmt = "SELECT login_name FROM profiles WHERE profiles.login_name = \'$address\';";
-    SendSQL($stmt);
-    my $found_address = FetchOneColumn();
-    return $found_address;
-  } elsif ($email_transform eq $EMAIL_TRANSFORM_BASE_DOMAIN) {
-    my ($username) = ($address =~ /(.+)@/);
-    my $stmt = "SELECT login_name FROM profiles WHERE profiles.login_name RLIKE \'$username\';";
-    SendSQL($stmt);
-
-    my $domain;
-    my $found = undef;
-    my $found_address;
-    my $new_address = undef;
-    while ((!$found) && ($found_address = FetchOneColumn())) {
-      ($domain) = ($found_address =~ /.+@(.+)/);
-      if ($address =~ /$domain/) {
-        $found = 1;
-        $new_address = $found_address;
-      }
-    }
-    return $new_address;
-  } elsif ($email_transform eq $EMAIL_TRANSFORM_NAME_ONLY) {
-    my ($username) = ($address =~ /(.+)@/);
-    my $stmt = "SELECT login_name FROM profiles WHERE profiles.login_name RLIKE \'$username\';";
-    SendSQL($stmt);
-    my $found_address = FetchOneColumn();
-    return $found_address;
-  }
-}
-
-1;

mozilla/webtools/bugzilla/contrib/README

@@ -1,22 +0,0 @@
-This directory contains contributed software related to Bugzilla.
-Things in here have not necessarily been tested or tried by anyone
-except the original contributor, so tred carefully.  But it may still
-be useful to you.
-
-This directory includes:
-
-  mysqld-watcher.pl --  This script can be installed as a frequent cron 
-                        job to clean up stalled/dead queries.
-        gnats2bz.pl --  A perl script to help import bugs from a GNATS 
-                        database into a Bugzilla database.  Contributed by
-                        Tom Schutter <tom@platte.com>
-
-       bug_email.pl --  A perl script that can receive email containing
-                        bug reports (email-interface). Contributed by
-                        Klaas Freitag <freitag@SuSE.de>
-	
-      README.Mailif --  Readme describing the mail interface.
-  bugmail_help.html --  User help page for the mail interface.
-
-       yp_nomail.sh --  Script you can run via cron that regularly updates
-                        the nomail file for terminated employees