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

Bug 326413 - We should report when schemavalidation fails to look up a namespace, patch=Dexter (gotdalife@gmail.com), r=me, smaug

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@254776 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
surkov.alexander%gmail.com
2008-10-28 14:21:32 +00:00
parent eef53a64ee
commit eb51d78568
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/extensions/xforms/nsXFormsModelElement.cpp
View File

@@ -1598,11 +1598,20 @@ NS_IMETHODIMP nsXFormsModelElement::GetTypeForNode(nsIDOMNode *aBoundNode,
}
if (validator.GetType(schemaTypeName, schemaTypeNamespace, aType))
rv = NS_OK;
else
rv = NS_ERROR_FAILURE;
return NS_OK;
if (schemaTypeNamespace.IsVoid()) {
const PRUnichar *strings[] = { schemaTypeName.get() };
nsXFormsUtils::ReportError(NS_LITERAL_STRING("typeNotFoundError"),
strings, 1, mElement, nsnull);
} else {
const PRUnichar *strings[] = { schemaTypeName.get(),
schemaTypeNamespace.get() };
nsXFormsUtils::ReportError(NS_LITERAL_STRING("typeNotFoundInNamespaceError"),
strings, 2, mElement, nsnull);
}
return rv;
return NS_ERROR_FAILURE;
}
/* static */ nsresult
@@ -2021,6 +2030,13 @@ nsXFormsModelElement::GetTypeFromNode(nsIDOMNode *aInstanceData,
domNode3 = do_QueryInterface(instanceNode, &rv);
NS_ENSURE_SUCCESS(rv, rv);
rv = domNode3->LookupNamespaceURI(prefix, aNSUri);
if (aNSUri.IsVoid()) {
// if it's still not found, report the error (can't lookup the prefix)
const PRUnichar *strings[] = { prefix.get() };
nsXFormsUtils::ReportError(NS_LITERAL_STRING("warnNamespaceBinding"),
strings, 1, mElement, nsnull);
}
}
return rv;