From 70bf5173d4ceb148f4281f95589b64f6b7e63bd9 Mon Sep 17 00:00:00 2001 From: "rjc%netscape.com" Date: Tue, 18 May 1999 06:27:04 +0000 Subject: [PATCH] More XUL template changes. Also re-enabling XUL_TEMPLATES. --- .../templates/src/nsXULTemplateBuilder.cpp | 77 ++++++++++++------- rdf/content/src/nsRDFGenericBuilder.cpp | 77 ++++++++++++------- rdf/content/src/nsRDFGenericBuilder.h | 5 +- rdf/content/src/nsXULTemplateBuilder.cpp | 77 ++++++++++++------- 4 files changed, 155 insertions(+), 81 deletions(-) diff --git a/content/xul/templates/src/nsXULTemplateBuilder.cpp b/content/xul/templates/src/nsXULTemplateBuilder.cpp index b859596d0a8d..9205d87a045d 100644 --- a/content/xul/templates/src/nsXULTemplateBuilder.cpp +++ b/content/xul/templates/src/nsXULTemplateBuilder.cpp @@ -70,6 +70,8 @@ #include "nsRDFGenericBuilder.h" +#define XUL_TEMPLATES 1 + //////////////////////////////////////////////////////////////////////// static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID); @@ -106,7 +108,6 @@ nsIAtom* RDFGenericBuilderImpl::kIgnoreAtom; nsIAtom* RDFGenericBuilderImpl::kSubcontainmentAtom; nsIAtom* RDFGenericBuilderImpl::kTreeTemplateAtom; nsIAtom* RDFGenericBuilderImpl::kRuleAtom; -nsIAtom* RDFGenericBuilderImpl::kTempAtom; nsIAtom* RDFGenericBuilderImpl::kTreeContentsGeneratedAtom; nsIAtom* RDFGenericBuilderImpl::kTextAtom; nsIAtom* RDFGenericBuilderImpl::kPropertyAtom; @@ -152,7 +153,6 @@ RDFGenericBuilderImpl::RDFGenericBuilderImpl(void) kSubcontainmentAtom = NS_NewAtom("subcontainment"); kTreeTemplateAtom = NS_NewAtom("template"); kRuleAtom = NS_NewAtom("rule"); - kTempAtom = NS_NewAtom("temp"); kTextAtom = NS_NewAtom("text"); kPropertyAtom = NS_NewAtom("property"); @@ -235,7 +235,6 @@ RDFGenericBuilderImpl::~RDFGenericBuilderImpl(void) NS_RELEASE(kSubcontainmentAtom); NS_RELEASE(kTreeTemplateAtom); NS_RELEASE(kRuleAtom); - NS_RELEASE(kTempAtom); NS_RELEASE(kTreeContentsGeneratedAtom); NS_RELEASE(kTextAtom); NS_RELEASE(kPropertyAtom); @@ -580,7 +579,7 @@ RDFGenericBuilderImpl::CreateContents(nsIContent* aElement) for (loop=0; loop tag; @@ -678,7 +680,7 @@ RDFGenericBuilderImpl::SetAllAttributesOnElement(nsIContent *aNode, nsIRDFResour NS_IMETHODIMP -RDFGenericBuilderImpl::IsTemplateRuleMatch(nsIContent *aNode, nsIContent *aRule, PRBool *matchingRuleFound) +RDFGenericBuilderImpl::IsTemplateRuleMatch(nsIRDFResource *aNode, nsIContent *aRule, PRBool *matchingRuleFound) { nsresult rv = NS_OK; PRInt32 count; @@ -695,25 +697,54 @@ RDFGenericBuilderImpl::IsTemplateRuleMatch(nsIContent *aNode, nsIContent *aRule, if (NS_FAILED(rv = aRule->GetAttribute(attribNameSpaceID, attribAtom, attribValue))) continue; - if ((attribNameSpaceID == kNameSpaceID_XUL) && (attribAtom.get() == kContainerAtom)) + // Note: some attributes must be skipped on XUL template rule subtree + + // never copy rdf:container attribute + if ((attribAtom.get() == kContainerAtom) && (attribNameSpaceID == kNameSpaceID_RDF)) + continue; + // never copy rdf:property attribute + else if ((attribAtom.get() == kPropertyAtom) && (attribNameSpaceID == kNameSpaceID_RDF)) + continue; + // never copy rdf:instanceOf attribute + else if ((attribAtom.get() == kInstanceOfAtom) && (attribNameSpaceID == kNameSpaceID_RDF)) + continue; + // never copy {}:ID attribute + else if ((attribAtom.get() == kIdAtom) && (attribNameSpaceID == kNameSpaceID_None)) + continue; + // never copy {}:itemcontentsgenerated attribute (bogus) + else if ((attribAtom.get() == kItemContentsGeneratedAtom) && (attribNameSpaceID == kNameSpaceID_None)) + continue; + // never copy {}:treecontentsgenerated attribute (bogus) + else if ((attribAtom.get() == kTreeContentsGeneratedAtom) && (attribNameSpaceID == kNameSpaceID_None)) + continue; + + else if ((attribNameSpaceID == kNameSpaceID_XUL) && (attribAtom.get() == kContainerAtom)) { // check and see if aNode is a container - nsAutoString nodeValue; - if (NS_SUCCEEDED(aNode->GetAttribute(kNameSpaceID_RDF, kContainerAtom, nodeValue))) - { - if (nodeValue.EqualsIgnoreCase(attribValue)) - { - *matchingRuleFound = PR_TRUE; - break; - } - } + PRBool containerFlag = IsContainer(aRule, aNode); + if (containerFlag && (!attribValue.EqualsIgnoreCase("true"))) break; + else if (!containerFlag && (!attribValue.EqualsIgnoreCase("false"))) break; + } + else + { + nsCOMPtr attribAtomResource; + if (NS_FAILED(rv = GetResource(attribNameSpaceID, attribAtom, getter_AddRefs(attribAtomResource)))) + break; + nsCOMPtr aResult; + if (NS_FAILED(rv = mDB->GetTarget(aNode, attribAtomResource, PR_TRUE, getter_AddRefs(aResult)))) + break; + nsCOMPtr aLiteral = do_QueryInterface(aResult); + if (!aLiteral) break; + PRUnichar *val = nsnull; + if (NS_FAILED(aLiteral->GetValue(&val))) break; + if (!attribValue.Equals(val)) break; } } return(rv); } NS_IMETHODIMP -RDFGenericBuilderImpl::FindTemplateForElement(nsIContent *aNode, nsIContent **theTemplate) +RDFGenericBuilderImpl::FindTemplateForResource(nsIRDFResource *aNode, nsIContent **theTemplate) { nsresult rv; PRInt32 count; @@ -1023,16 +1054,10 @@ NS_IMETHODIMP RDFGenericBuilderImpl::CreateWidgetItem(nsIContent *aElement, nsIRDFResource *aProperty, nsIRDFResource *aValue, PRInt32 aNaturalOrderPos) { - nsCOMPtr aTemplate, tempNode; + nsCOMPtr aTemplate; nsresult rv; - if (NS_FAILED(rv = CreateResourceElement(kNameSpaceID_XUL, kTempAtom, - aValue, getter_AddRefs(tempNode)))) - return(rv); - if (NS_FAILED(rv = SetAllAttributesOnElement(tempNode, aValue))) - return(rv); - - if (NS_SUCCEEDED(rv = FindTemplateForElement(tempNode, getter_AddRefs(aTemplate))) && + if (NS_SUCCEEDED(rv = FindTemplateForResource(aValue, getter_AddRefs(aTemplate))) && (aTemplate)) { nsCOMPtr children = do_QueryInterface(aElement); diff --git a/rdf/content/src/nsRDFGenericBuilder.cpp b/rdf/content/src/nsRDFGenericBuilder.cpp index b859596d0a8d..9205d87a045d 100644 --- a/rdf/content/src/nsRDFGenericBuilder.cpp +++ b/rdf/content/src/nsRDFGenericBuilder.cpp @@ -70,6 +70,8 @@ #include "nsRDFGenericBuilder.h" +#define XUL_TEMPLATES 1 + //////////////////////////////////////////////////////////////////////// static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID); @@ -106,7 +108,6 @@ nsIAtom* RDFGenericBuilderImpl::kIgnoreAtom; nsIAtom* RDFGenericBuilderImpl::kSubcontainmentAtom; nsIAtom* RDFGenericBuilderImpl::kTreeTemplateAtom; nsIAtom* RDFGenericBuilderImpl::kRuleAtom; -nsIAtom* RDFGenericBuilderImpl::kTempAtom; nsIAtom* RDFGenericBuilderImpl::kTreeContentsGeneratedAtom; nsIAtom* RDFGenericBuilderImpl::kTextAtom; nsIAtom* RDFGenericBuilderImpl::kPropertyAtom; @@ -152,7 +153,6 @@ RDFGenericBuilderImpl::RDFGenericBuilderImpl(void) kSubcontainmentAtom = NS_NewAtom("subcontainment"); kTreeTemplateAtom = NS_NewAtom("template"); kRuleAtom = NS_NewAtom("rule"); - kTempAtom = NS_NewAtom("temp"); kTextAtom = NS_NewAtom("text"); kPropertyAtom = NS_NewAtom("property"); @@ -235,7 +235,6 @@ RDFGenericBuilderImpl::~RDFGenericBuilderImpl(void) NS_RELEASE(kSubcontainmentAtom); NS_RELEASE(kTreeTemplateAtom); NS_RELEASE(kRuleAtom); - NS_RELEASE(kTempAtom); NS_RELEASE(kTreeContentsGeneratedAtom); NS_RELEASE(kTextAtom); NS_RELEASE(kPropertyAtom); @@ -580,7 +579,7 @@ RDFGenericBuilderImpl::CreateContents(nsIContent* aElement) for (loop=0; loop tag; @@ -678,7 +680,7 @@ RDFGenericBuilderImpl::SetAllAttributesOnElement(nsIContent *aNode, nsIRDFResour NS_IMETHODIMP -RDFGenericBuilderImpl::IsTemplateRuleMatch(nsIContent *aNode, nsIContent *aRule, PRBool *matchingRuleFound) +RDFGenericBuilderImpl::IsTemplateRuleMatch(nsIRDFResource *aNode, nsIContent *aRule, PRBool *matchingRuleFound) { nsresult rv = NS_OK; PRInt32 count; @@ -695,25 +697,54 @@ RDFGenericBuilderImpl::IsTemplateRuleMatch(nsIContent *aNode, nsIContent *aRule, if (NS_FAILED(rv = aRule->GetAttribute(attribNameSpaceID, attribAtom, attribValue))) continue; - if ((attribNameSpaceID == kNameSpaceID_XUL) && (attribAtom.get() == kContainerAtom)) + // Note: some attributes must be skipped on XUL template rule subtree + + // never copy rdf:container attribute + if ((attribAtom.get() == kContainerAtom) && (attribNameSpaceID == kNameSpaceID_RDF)) + continue; + // never copy rdf:property attribute + else if ((attribAtom.get() == kPropertyAtom) && (attribNameSpaceID == kNameSpaceID_RDF)) + continue; + // never copy rdf:instanceOf attribute + else if ((attribAtom.get() == kInstanceOfAtom) && (attribNameSpaceID == kNameSpaceID_RDF)) + continue; + // never copy {}:ID attribute + else if ((attribAtom.get() == kIdAtom) && (attribNameSpaceID == kNameSpaceID_None)) + continue; + // never copy {}:itemcontentsgenerated attribute (bogus) + else if ((attribAtom.get() == kItemContentsGeneratedAtom) && (attribNameSpaceID == kNameSpaceID_None)) + continue; + // never copy {}:treecontentsgenerated attribute (bogus) + else if ((attribAtom.get() == kTreeContentsGeneratedAtom) && (attribNameSpaceID == kNameSpaceID_None)) + continue; + + else if ((attribNameSpaceID == kNameSpaceID_XUL) && (attribAtom.get() == kContainerAtom)) { // check and see if aNode is a container - nsAutoString nodeValue; - if (NS_SUCCEEDED(aNode->GetAttribute(kNameSpaceID_RDF, kContainerAtom, nodeValue))) - { - if (nodeValue.EqualsIgnoreCase(attribValue)) - { - *matchingRuleFound = PR_TRUE; - break; - } - } + PRBool containerFlag = IsContainer(aRule, aNode); + if (containerFlag && (!attribValue.EqualsIgnoreCase("true"))) break; + else if (!containerFlag && (!attribValue.EqualsIgnoreCase("false"))) break; + } + else + { + nsCOMPtr attribAtomResource; + if (NS_FAILED(rv = GetResource(attribNameSpaceID, attribAtom, getter_AddRefs(attribAtomResource)))) + break; + nsCOMPtr aResult; + if (NS_FAILED(rv = mDB->GetTarget(aNode, attribAtomResource, PR_TRUE, getter_AddRefs(aResult)))) + break; + nsCOMPtr aLiteral = do_QueryInterface(aResult); + if (!aLiteral) break; + PRUnichar *val = nsnull; + if (NS_FAILED(aLiteral->GetValue(&val))) break; + if (!attribValue.Equals(val)) break; } } return(rv); } NS_IMETHODIMP -RDFGenericBuilderImpl::FindTemplateForElement(nsIContent *aNode, nsIContent **theTemplate) +RDFGenericBuilderImpl::FindTemplateForResource(nsIRDFResource *aNode, nsIContent **theTemplate) { nsresult rv; PRInt32 count; @@ -1023,16 +1054,10 @@ NS_IMETHODIMP RDFGenericBuilderImpl::CreateWidgetItem(nsIContent *aElement, nsIRDFResource *aProperty, nsIRDFResource *aValue, PRInt32 aNaturalOrderPos) { - nsCOMPtr aTemplate, tempNode; + nsCOMPtr aTemplate; nsresult rv; - if (NS_FAILED(rv = CreateResourceElement(kNameSpaceID_XUL, kTempAtom, - aValue, getter_AddRefs(tempNode)))) - return(rv); - if (NS_FAILED(rv = SetAllAttributesOnElement(tempNode, aValue))) - return(rv); - - if (NS_SUCCEEDED(rv = FindTemplateForElement(tempNode, getter_AddRefs(aTemplate))) && + if (NS_SUCCEEDED(rv = FindTemplateForResource(aValue, getter_AddRefs(aTemplate))) && (aTemplate)) { nsCOMPtr children = do_QueryInterface(aElement); diff --git a/rdf/content/src/nsRDFGenericBuilder.h b/rdf/content/src/nsRDFGenericBuilder.h index 16ba8a37dfba..d86f3e984194 100644 --- a/rdf/content/src/nsRDFGenericBuilder.h +++ b/rdf/content/src/nsRDFGenericBuilder.h @@ -63,8 +63,8 @@ public: NS_IMETHOD CreateContents(nsIContent* aElement); NS_IMETHOD SetAllAttributesOnElement(nsIContent *aNode, nsIRDFResource *res); - NS_IMETHOD FindTemplateForElement(nsIContent *aNode, nsIContent **theTemplate); - NS_IMETHOD IsTemplateRuleMatch(nsIContent *aNode, nsIContent *aRule, PRBool *matchingRuleFound); + 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); @@ -198,7 +198,6 @@ protected: static nsIAtom* kSubcontainmentAtom; static nsIAtom* kTreeTemplateAtom; static nsIAtom* kRuleAtom; - static nsIAtom* kTempAtom; static nsIAtom* kTreeContentsGeneratedAtom; static nsIAtom* kTextAtom; static nsIAtom* kPropertyAtom; diff --git a/rdf/content/src/nsXULTemplateBuilder.cpp b/rdf/content/src/nsXULTemplateBuilder.cpp index b859596d0a8d..9205d87a045d 100644 --- a/rdf/content/src/nsXULTemplateBuilder.cpp +++ b/rdf/content/src/nsXULTemplateBuilder.cpp @@ -70,6 +70,8 @@ #include "nsRDFGenericBuilder.h" +#define XUL_TEMPLATES 1 + //////////////////////////////////////////////////////////////////////// static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID); @@ -106,7 +108,6 @@ nsIAtom* RDFGenericBuilderImpl::kIgnoreAtom; nsIAtom* RDFGenericBuilderImpl::kSubcontainmentAtom; nsIAtom* RDFGenericBuilderImpl::kTreeTemplateAtom; nsIAtom* RDFGenericBuilderImpl::kRuleAtom; -nsIAtom* RDFGenericBuilderImpl::kTempAtom; nsIAtom* RDFGenericBuilderImpl::kTreeContentsGeneratedAtom; nsIAtom* RDFGenericBuilderImpl::kTextAtom; nsIAtom* RDFGenericBuilderImpl::kPropertyAtom; @@ -152,7 +153,6 @@ RDFGenericBuilderImpl::RDFGenericBuilderImpl(void) kSubcontainmentAtom = NS_NewAtom("subcontainment"); kTreeTemplateAtom = NS_NewAtom("template"); kRuleAtom = NS_NewAtom("rule"); - kTempAtom = NS_NewAtom("temp"); kTextAtom = NS_NewAtom("text"); kPropertyAtom = NS_NewAtom("property"); @@ -235,7 +235,6 @@ RDFGenericBuilderImpl::~RDFGenericBuilderImpl(void) NS_RELEASE(kSubcontainmentAtom); NS_RELEASE(kTreeTemplateAtom); NS_RELEASE(kRuleAtom); - NS_RELEASE(kTempAtom); NS_RELEASE(kTreeContentsGeneratedAtom); NS_RELEASE(kTextAtom); NS_RELEASE(kPropertyAtom); @@ -580,7 +579,7 @@ RDFGenericBuilderImpl::CreateContents(nsIContent* aElement) for (loop=0; loop tag; @@ -678,7 +680,7 @@ RDFGenericBuilderImpl::SetAllAttributesOnElement(nsIContent *aNode, nsIRDFResour NS_IMETHODIMP -RDFGenericBuilderImpl::IsTemplateRuleMatch(nsIContent *aNode, nsIContent *aRule, PRBool *matchingRuleFound) +RDFGenericBuilderImpl::IsTemplateRuleMatch(nsIRDFResource *aNode, nsIContent *aRule, PRBool *matchingRuleFound) { nsresult rv = NS_OK; PRInt32 count; @@ -695,25 +697,54 @@ RDFGenericBuilderImpl::IsTemplateRuleMatch(nsIContent *aNode, nsIContent *aRule, if (NS_FAILED(rv = aRule->GetAttribute(attribNameSpaceID, attribAtom, attribValue))) continue; - if ((attribNameSpaceID == kNameSpaceID_XUL) && (attribAtom.get() == kContainerAtom)) + // Note: some attributes must be skipped on XUL template rule subtree + + // never copy rdf:container attribute + if ((attribAtom.get() == kContainerAtom) && (attribNameSpaceID == kNameSpaceID_RDF)) + continue; + // never copy rdf:property attribute + else if ((attribAtom.get() == kPropertyAtom) && (attribNameSpaceID == kNameSpaceID_RDF)) + continue; + // never copy rdf:instanceOf attribute + else if ((attribAtom.get() == kInstanceOfAtom) && (attribNameSpaceID == kNameSpaceID_RDF)) + continue; + // never copy {}:ID attribute + else if ((attribAtom.get() == kIdAtom) && (attribNameSpaceID == kNameSpaceID_None)) + continue; + // never copy {}:itemcontentsgenerated attribute (bogus) + else if ((attribAtom.get() == kItemContentsGeneratedAtom) && (attribNameSpaceID == kNameSpaceID_None)) + continue; + // never copy {}:treecontentsgenerated attribute (bogus) + else if ((attribAtom.get() == kTreeContentsGeneratedAtom) && (attribNameSpaceID == kNameSpaceID_None)) + continue; + + else if ((attribNameSpaceID == kNameSpaceID_XUL) && (attribAtom.get() == kContainerAtom)) { // check and see if aNode is a container - nsAutoString nodeValue; - if (NS_SUCCEEDED(aNode->GetAttribute(kNameSpaceID_RDF, kContainerAtom, nodeValue))) - { - if (nodeValue.EqualsIgnoreCase(attribValue)) - { - *matchingRuleFound = PR_TRUE; - break; - } - } + PRBool containerFlag = IsContainer(aRule, aNode); + if (containerFlag && (!attribValue.EqualsIgnoreCase("true"))) break; + else if (!containerFlag && (!attribValue.EqualsIgnoreCase("false"))) break; + } + else + { + nsCOMPtr attribAtomResource; + if (NS_FAILED(rv = GetResource(attribNameSpaceID, attribAtom, getter_AddRefs(attribAtomResource)))) + break; + nsCOMPtr aResult; + if (NS_FAILED(rv = mDB->GetTarget(aNode, attribAtomResource, PR_TRUE, getter_AddRefs(aResult)))) + break; + nsCOMPtr aLiteral = do_QueryInterface(aResult); + if (!aLiteral) break; + PRUnichar *val = nsnull; + if (NS_FAILED(aLiteral->GetValue(&val))) break; + if (!attribValue.Equals(val)) break; } } return(rv); } NS_IMETHODIMP -RDFGenericBuilderImpl::FindTemplateForElement(nsIContent *aNode, nsIContent **theTemplate) +RDFGenericBuilderImpl::FindTemplateForResource(nsIRDFResource *aNode, nsIContent **theTemplate) { nsresult rv; PRInt32 count; @@ -1023,16 +1054,10 @@ NS_IMETHODIMP RDFGenericBuilderImpl::CreateWidgetItem(nsIContent *aElement, nsIRDFResource *aProperty, nsIRDFResource *aValue, PRInt32 aNaturalOrderPos) { - nsCOMPtr aTemplate, tempNode; + nsCOMPtr aTemplate; nsresult rv; - if (NS_FAILED(rv = CreateResourceElement(kNameSpaceID_XUL, kTempAtom, - aValue, getter_AddRefs(tempNode)))) - return(rv); - if (NS_FAILED(rv = SetAllAttributesOnElement(tempNode, aValue))) - return(rv); - - if (NS_SUCCEEDED(rv = FindTemplateForElement(tempNode, getter_AddRefs(aTemplate))) && + if (NS_SUCCEEDED(rv = FindTemplateForResource(aValue, getter_AddRefs(aTemplate))) && (aTemplate)) { nsCOMPtr children = do_QueryInterface(aElement);