Make classes inherit from nsXFormsStubElement where applicable. r=darin

2004-11-04 00:24:40 +00:00 · 2004-11-04 00:24:40 +00:00 · c549f3dca6
--- a/extensions/xforms/nsXFormsInstanceElement.cpp
+++ b/extensions/xforms/nsXFormsInstanceElement.cpp
@ -49,23 +49,11 @@
 #include "nsIXTFGenericElementWrapper.h"
 #include "nsXFormsUtils.h"

-static const nsIID sScriptingIIDs[] = {
-  NS_IDOMELEMENT_IID,
-  NS_IDOMEVENTTARGET_IID,
-  NS_IDOM3NODE_IID
-};
-
-NS_IMPL_ADDREF(nsXFormsInstanceElement)
-NS_IMPL_RELEASE(nsXFormsInstanceElement)
-
-NS_INTERFACE_MAP_BEGIN(nsXFormsInstanceElement)
-  NS_INTERFACE_MAP_ENTRY(nsIXTFGenericElement)
-  NS_INTERFACE_MAP_ENTRY(nsIXTFElement)
-  NS_INTERFACE_MAP_ENTRY(nsIInstanceElementPrivate)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMLoadListener)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMEventListener)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXTFGenericElement)
-NS_INTERFACE_MAP_END
+NS_IMPL_ISUPPORTS_INHERITED3(nsXFormsInstanceElement,
+                             nsXFormsStubElement,
+                             nsIInstanceElementPrivate,
+                             nsIDOMLoadListener,
+                             nsIDOMEventListener)

 nsXFormsInstanceElement::nsXFormsInstanceElement()
  : mElement(nsnull)
@ -82,96 +70,6 @@ nsXFormsInstanceElement::OnDestroyed()
  return NS_OK;
 }

-NS_IMETHODIMP
-nsXFormsInstanceElement::GetElementType(PRUint32 *aElementType)
-{
-  *aElementType = nsIXTFElement::ELEMENT_TYPE_GENERIC_ELEMENT;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsInstanceElement::GetIsAttributeHandler(PRBool *aIsAttributeHandler)
-{
-  *aIsAttributeHandler = PR_FALSE;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsInstanceElement::GetScriptingInterfaces(PRUint32 *aCount,
-                                                nsIID ***aArray)
-{
-  return nsXFormsUtils::CloneScriptingInterfaces(sScriptingIIDs,
-                                                 NS_ARRAY_LENGTH(sScriptingIIDs),
-                                                 aCount, aArray);
-}
-
-NS_IMETHODIMP
-nsXFormsInstanceElement::WillChangeDocument(nsIDOMDocument *aNewDocument)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsInstanceElement::DocumentChanged(nsIDOMDocument *aNewDocument)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsInstanceElement::WillChangeParent(nsIDOMElement *aNewParent)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsInstanceElement::ParentChanged(nsIDOMElement *aNewParent)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsInstanceElement::WillInsertChild(nsIDOMNode *aChild, PRUint32 aIndex)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsInstanceElement::ChildInserted(nsIDOMNode *aChild, PRUint32 aIndex)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsInstanceElement::WillAppendChild(nsIDOMNode *aChild)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsInstanceElement::ChildAppended(nsIDOMNode *aChild)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsInstanceElement::WillRemoveChild(PRUint32 aIndex)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsInstanceElement::ChildRemoved(PRUint32 aIndex)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsInstanceElement::WillSetAttribute(nsIAtom *aName,
-                                          const nsAString &aNewValue)
-{
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsXFormsInstanceElement::AttributeSet(nsIAtom *aName,
                                      const nsAString &aNewValue)
@ -188,12 +86,6 @@ nsXFormsInstanceElement::AttributeSet(nsIAtom *aName,
  return NS_OK;
 }

-NS_IMETHODIMP
-nsXFormsInstanceElement::WillRemoveAttribute(nsIAtom *aName)
-{
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsXFormsInstanceElement::AttributeRemoved(nsIAtom *aName)
 {
@ -226,13 +118,6 @@ nsXFormsInstanceElement::DoneAddingChildren()
  return NS_OK;
 }

-NS_IMETHODIMP
-nsXFormsInstanceElement::HandleDefault(nsIDOMEvent *aEvent, PRBool *aHandled)
-{
-  *aHandled = PR_FALSE;
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsXFormsInstanceElement::OnCreated(nsIXTFGenericElementWrapper *aWrapper)
 {
--- a/extensions/xforms/nsXFormsInstanceElement.h
+++ b/extensions/xforms/nsXFormsInstanceElement.h
@ -45,7 +45,7 @@
 #ifndef nsXFormsInstanceElement_h_
 #define nsXFormsInstanceElement_h_

-#include "nsIXTFGenericElement.h"
+#include "nsXFormsStubElement.h"
 #include "nsIDOMDocument.h"
 #include "nsCOMPtr.h"
 #include "nsIDOMLoadListener.h"
@ -54,16 +54,21 @@

 class nsIDOMElement;

-class nsXFormsInstanceElement : public nsIXTFGenericElement,
+class nsXFormsInstanceElement : public nsXFormsStubElement,
                                public nsIInstanceElementPrivate,
                                public nsIDOMLoadListener
 {
 public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIXTFELEMENT
-  NS_DECL_NSIXTFGENERICELEMENT
+  NS_DECL_ISUPPORTS_INHERITED
  NS_DECL_NSIINSTANCEELEMENTPRIVATE

+  // nsIXTFGenericElement overrides
+  NS_IMETHOD OnDestroyed();
+  NS_IMETHOD AttributeSet(nsIAtom *aName, const nsAString &aNewValue);
+  NS_IMETHOD AttributeRemoved(nsIAtom *aName);
+  NS_IMETHOD DoneAddingChildren();
+  NS_IMETHOD OnCreated(nsIXTFGenericElementWrapper *aWrapper);
+
  // nsIDOMEventListener
  NS_IMETHOD HandleEvent(nsIDOMEvent *aEvent);

--- a/extensions/xforms/nsXFormsModelElement.cpp
+++ b/extensions/xforms/nsXFormsModelElement.cpp
@ -116,20 +116,14 @@ nsXFormsModelElement::nsXFormsModelElement()
 {
 }

-NS_IMPL_ADDREF(nsXFormsModelElement)
-NS_IMPL_RELEASE(nsXFormsModelElement)
-
-NS_INTERFACE_MAP_BEGIN(nsXFormsModelElement)
-  NS_INTERFACE_MAP_ENTRY(nsIXTFElement)
-  NS_INTERFACE_MAP_ENTRY(nsIXTFGenericElement)
-  NS_INTERFACE_MAP_ENTRY(nsIXFormsModelElement)
-  NS_INTERFACE_MAP_ENTRY(nsIModelElementPrivate)
-  NS_INTERFACE_MAP_ENTRY(nsISchemaLoadListener)
-  NS_INTERFACE_MAP_ENTRY(nsIWebServiceErrorHandler)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMLoadListener)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMEventListener)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXTFElement)
-NS_INTERFACE_MAP_END
+NS_IMPL_ISUPPORTS_INHERITED6(nsXFormsModelElement,
+                             nsXFormsStubElement,
+                             nsIXFormsModelElement,
+                             nsIModelElementPrivate,
+                             nsISchemaLoadListener,
+                             nsIWebServiceErrorHandler,
+                             nsIDOMLoadListener,
+                             nsIDOMEventListener)

 NS_IMETHODIMP
 nsXFormsModelElement::OnDestroyed()
@ -172,20 +166,6 @@ nsXFormsModelElement::RemoveModelFromDocument()
  }
 }

-NS_IMETHODIMP
-nsXFormsModelElement::GetElementType(PRUint32 *aType)
-{
-  *aType = ELEMENT_TYPE_GENERIC_ELEMENT;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsModelElement::GetIsAttributeHandler(PRBool *aIsHandler)
-{
-  *aIsHandler = PR_FALSE;
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsXFormsModelElement::GetScriptingInterfaces(PRUint32 *aCount, nsIID ***aArray)
 {
@ -241,79 +221,6 @@ nsXFormsModelElement::DocumentChanged(nsIDOMDocument* aNewDocument)
  return NS_OK;
 }

-NS_IMETHODIMP
-nsXFormsModelElement::WillChangeParent(nsIDOMElement* aNewParent)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsModelElement::ParentChanged(nsIDOMElement* aNewParent)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsModelElement::WillInsertChild(nsIDOMNode* aChild, PRUint32 aIndex)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsModelElement::ChildInserted(nsIDOMNode* aChild, PRUint32 aIndex)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsModelElement::WillAppendChild(nsIDOMNode* aChild)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsModelElement::ChildAppended(nsIDOMNode* aChild)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsModelElement::WillRemoveChild(PRUint32 aIndex)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsModelElement::ChildRemoved(PRUint32 aIndex)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsModelElement::WillSetAttribute(nsIAtom *aName,
-                                       const nsAString &aNewValue)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsModelElement::AttributeSet(nsIAtom *aName, const nsAString &aNewValue)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsModelElement::WillRemoveAttribute(nsIAtom *aName)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsModelElement::AttributeRemoved(nsIAtom *aName)
-{
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsXFormsModelElement::DoneAddingChildren()
 {
--- a/extensions/xforms/nsXFormsModelElement.h
+++ b/extensions/xforms/nsXFormsModelElement.h
@ -39,7 +39,7 @@
 #ifndef nsXFormsModelElement_h_
 #define nsXFormsModelElement_h_

-#include "nsIXTFGenericElement.h"
+#include "nsXFormsStubElement.h"
 #include "nsIModelElementPrivate.h"
 #include "nsISchema.h"
 #include "nsCOMArray.h"
@ -73,7 +73,7 @@ enum nsXFormsModelEvent {
  eEvent_ComputeException
 };

-class nsXFormsModelElement : public nsIXTFGenericElement,
+class nsXFormsModelElement : public nsXFormsStubElement,
                             public nsIModelElementPrivate,
                             public nsISchemaLoadListener,
                             public nsIDOMLoadListener
@ -81,15 +81,22 @@ class nsXFormsModelElement : public nsIXTFGenericElement,
 public:
  nsXFormsModelElement() NS_HIDDEN;

-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIXTFELEMENT
-  NS_DECL_NSIXTFGENERICELEMENT
+  NS_DECL_ISUPPORTS_INHERITED
  NS_DECL_NSIXFORMSMODELELEMENT
  NS_DECL_NSIMODELELEMENTPRIVATE
  NS_DECL_NSISCHEMALOADLISTENER
  NS_DECL_NSIWEBSERVICEERRORHANDLER
  NS_DECL_NSIDOMEVENTLISTENER

+  // nsIXTFGenericElement overrides
+  NS_IMETHOD OnDestroyed();
+  NS_IMETHOD GetScriptingInterfaces(PRUint32 *aCount, nsIID ***aArray);
+  NS_IMETHOD WillChangeDocument(nsIDOMDocument *aNewDocument);
+  NS_IMETHOD DocumentChanged(nsIDOMDocument *aNewDocument);
+  NS_IMETHOD DoneAddingChildren();
+  NS_IMETHOD HandleDefault(nsIDOMEvent *aEvent, PRBool *aHandled);
+  NS_IMETHOD OnCreated(nsIXTFGenericElementWrapper *aWrapper);
+
  // nsIDOMLoadListener
  NS_IMETHOD Load(nsIDOMEvent* aEvent);
  NS_IMETHOD BeforeUnload(nsIDOMEvent* aEvent);
--- a/extensions/xforms/nsXFormsSubmissionElement.cpp
+++ b/extensions/xforms/nsXFormsSubmissionElement.cpp
@ -85,11 +85,11 @@
 #include "nsNetUtil.h"
 #include "nsXFormsUtils.h"

-static const nsIID sScriptingIIDs[] = {
-  NS_IDOMELEMENT_IID,
-  NS_IDOMEVENTTARGET_IID,
-  NS_IDOM3NODE_IID
-};
+// namespace literals
+#define NAMESPACE_XML_SCHEMA \
+        NS_LITERAL_STRING("http://www.w3.org/2001/XMLSchema")
+#define NAMESPACE_XML_SCHEMA_INSTANCE \
+        NS_LITERAL_STRING("http://www.w3.org/2001/XMLSchema-instance")

 // submission methods
 #define METHOD_GET                    0x01
@ -230,10 +230,9 @@ public:

 // nsISupports

-NS_IMPL_ISUPPORTS3(nsXFormsSubmissionElement,
-                   nsIXTFElement,
-                   nsIXTFGenericElement,
-                   nsIRequestObserver)
+NS_IMPL_ISUPPORTS_INHERITED1(nsXFormsSubmissionElement,
+                             nsXFormsStubElement,
+                             nsIRequestObserver)

 // nsIXTFElement

@ -244,119 +243,6 @@ nsXFormsSubmissionElement::OnDestroyed()
  return NS_OK;
 }

-NS_IMETHODIMP
-nsXFormsSubmissionElement::GetElementType(PRUint32 *aElementType)
-{
-  *aElementType = nsIXTFElement::ELEMENT_TYPE_GENERIC_ELEMENT;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsSubmissionElement::GetIsAttributeHandler(PRBool *aIsAttributeHandler)
-{
-  *aIsAttributeHandler = PR_FALSE;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsSubmissionElement::GetScriptingInterfaces(PRUint32 *aCount, nsIID ***aArray)
-{
-  return nsXFormsUtils::CloneScriptingInterfaces(sScriptingIIDs,
-                                                 NS_ARRAY_LENGTH(sScriptingIIDs),
-                                                 aCount, aArray);
-}
-
-NS_IMETHODIMP
-nsXFormsSubmissionElement::WillChangeDocument(nsIDOMDocument *aNewDocument)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsSubmissionElement::DocumentChanged(nsIDOMDocument *aNewDocument)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsSubmissionElement::WillChangeParent(nsIDOMElement *aNewParent)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsSubmissionElement::ParentChanged(nsIDOMElement *aNewParent)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsSubmissionElement::WillInsertChild(nsIDOMNode *aChild, PRUint32 aIndex)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsSubmissionElement::ChildInserted(nsIDOMNode *aChild, PRUint32 aIndex)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsSubmissionElement::WillAppendChild(nsIDOMNode *aChild)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsSubmissionElement::ChildAppended(nsIDOMNode *aChild)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsSubmissionElement::WillRemoveChild(PRUint32 aIndex)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsSubmissionElement::ChildRemoved(PRUint32 aIndex)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsSubmissionElement::WillSetAttribute(nsIAtom *aName,
-                                            const nsAString &aNewValue)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsSubmissionElement::AttributeSet(nsIAtom *aName, const nsAString &aNewValue)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsSubmissionElement::WillRemoveAttribute(nsIAtom *aName)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsSubmissionElement::AttributeRemoved(nsIAtom *aName)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXFormsSubmissionElement::DoneAddingChildren()
-{
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsXFormsSubmissionElement::HandleDefault(nsIDOMEvent *aEvent, PRBool *aHandled)
 {
--- a/extensions/xforms/nsXFormsSubmissionElement.h
+++ b/extensions/xforms/nsXFormsSubmissionElement.h
@ -39,7 +39,7 @@
 #ifndef nsXFormsSubmissionElement_h_
 #define nsXFormsSubmissionElement_h_

-#include "nsIXTFGenericElement.h"
+#include "nsXFormsStubElement.h"
 #include "nsIRequestObserver.h"
 #include "nsIInputStream.h"
 #include "nsCOMPtr.h"
@ -54,19 +54,22 @@ class nsString;

 class SubmissionAttachmentArray;

-class nsXFormsSubmissionElement : public nsIXTFGenericElement,
+class nsXFormsSubmissionElement : public nsXFormsStubElement,
                                  public nsIRequestObserver
 {
 public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIXTFELEMENT
-  NS_DECL_NSIXTFGENERICELEMENT
+  NS_DECL_ISUPPORTS_INHERITED
  NS_DECL_NSIREQUESTOBSERVER

  nsXFormsSubmissionElement()
    : mElement(nsnull)
  {}

+  // nsIXTFGenericElement overrides
+  NS_IMETHOD OnDestroyed();
+  NS_IMETHOD HandleDefault(nsIDOMEvent *aEvent, PRBool *aHandled);
+  NS_IMETHOD OnCreated(nsIXTFGenericElementWrapper *aWrapper);
+
  NS_HIDDEN_(already_AddRefed<nsIModelElementPrivate>) GetModel();

  NS_HIDDEN_(nsresult) LoadReplaceInstance(nsIChannel *);