mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

implement exception constants defined in DOM level 3 

b=245476, patch by jonathan.watt@strath.ac.uk, r=peterv, sr=jst

remove redundant declarations and correct comment
b=251824, patch by jonathan.watt@strath.ac.uk, r+sr=peterv
This commit is contained in:
dwitte%stanford.edu 2004-07-19 04:04:41 +00:00
Родитель 6597fbb3d4
Коммит 8ad12148c3
5 изменённых файлов: 21 добавлений и 126 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
dom/public/idl/core/nsIDOMDOMException.idl
Просмотреть файл

@ -40,15 +40,15 @@
#include "domstubs.idl"
/**
* In general, DOM methods return specific error values in ordinary
* In general, DOM methods return specific error values in ordinary
* processing situations, such as out-of-bound errors.
* However, DOM operations can raise exceptions in "exceptional"
* circumstances, i.e., when an operation is impossible to perform
* (either for logical reasons, because data is lost, or because the
* However, DOM operations can raise exceptions in "exceptional"
* circumstances, i.e., when an operation is impossible to perform
* (either for logical reasons, because data is lost, or because the
* implementation has become unstable)
*
* For more information on this interface please see
* http://www.w3.org/TR/DOM-Level-2-Core/
* For more information on this interface please see
* http://www.w3.org/TR/DOM-Level-3-Core/
*
* @status FROZEN
*/
@ -76,6 +76,10 @@ interface nsIDOMDOMException : nsISupports
const unsigned short NAMESPACE_ERR = 14;
// Introduced in DOM Level 2:
const unsigned short INVALID_ACCESS_ERR = 15;
// Introduced in DOM Level 3:
const unsigned short VALIDATION_ERR = 16;
// Introduced in DOM Level 3:
const unsigned short TYPE_MISMATCH_ERR = 17;
readonly attribute unsigned long code;
};

7
dom/public/nsDOMError.h
Просмотреть файл

@ -41,7 +41,7 @@
#include "nsError.h"
// XXX If you add a new error code, also add an error string to
// dom/base/src/domerr.msg
// dom/src/base/domerr.msg
/* DOM error codes from http://www.w3.org/TR/REC-DOM-Level-1/ */
@ -69,6 +69,11 @@
#define NS_ERROR_DOM_RANGE_BAD_BOUNDARYPOINTS_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_RANGE, 1)
#define NS_ERROR_DOM_RANGE_INVALID_NODE_TYPE_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_RANGE, 2)
/* DOM error codes from http://www.w3.org/TR/DOM-Level-3/ */
#define NS_ERROR_DOM_VALIDATION_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,16)
#define NS_ERROR_DOM_TYPE_MISMATCH_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,17)
/* DOM error codes defined by us */

3
dom/public/nsIBaseDOMException.h
Просмотреть файл

@ -100,9 +100,6 @@ NS_INTERFACE_MAP_END \
NS_DEFINE_CID(kBaseDOMException_CID_##domname, NS_BASE_DOM_EXCEPTION_CID); \
\
nsresult \
NS_New##domname(nsresult aNSResult, nsIException* aDefaultException, \
nsIException** aException); \
nsresult \
NS_New##domname(nsresult aNSResult, nsIException* aDefaultException, \
nsIException** aException) \
{ \

5
dom/src/base/domerr.msg
Просмотреть файл

@ -64,6 +64,11 @@ DOM_MSG_DEF(NS_ERROR_DOM_SYNTAX_ERR, "An invalid or illegal string was specified
DOM_MSG_DEF(NS_ERROR_DOM_RANGE_BAD_BOUNDARYPOINTS_ERR, "The boundary-points of a range does not meet specific requirements.")
DOM_MSG_DEF(NS_ERROR_DOM_RANGE_INVALID_NODE_TYPE_ERR, "The container of an boundary-point of a range is being set to either a node of an invalid type or a node with an ancestor of an invalid type.")
/* DOM error codes from http://www.w3.org/TR/DOM-Level-3/ */
DOM_MSG_DEF(NS_ERROR_DOM_VALIDATION_ERR, "A call to a method would make the Node invalid with respect to \"partial validity\", so the operation was not done")
DOM_MSG_DEF(NS_ERROR_DOM_TYPE_MISMATCH_ERR, "The type of an object is incompatible with the expected type of the parameter associated to the object")
/* DOM error codes defined by us */
/* XXX string should be specified by norris */

116
extensions/transformiix/source/xpath/nsXPathException.cpp
Просмотреть файл

@ -1,116 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* 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 TransforMiiX XSLT processor code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 2001
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Peter Van der Beken <peterv@propagandism.org>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsXPathException.h"
#include "nsCRT.h"
#include "nsIDOMClassInfo.h"
#include "nsIBaseDOMException.h"
#include "prprf.h"
static const char kInvalidExpressionErrName[] = "NS_ERROR_DOM_INVALID_EXPRESSION_ERR";
static const char kInvalidExpressionErrMessage[] = NS_ERROR_DOM_INVALID_EXPRESSION_MSG;
static const char kTypeErrName[] = "NS_ERROR_DOM_TYPE_ERR";
static const char kTypeErrMessage[] = NS_ERROR_DOM_TYPE_MSG;
static void
TXResultToNameAndMessage(nsresult aNSResult,
const char** aName,
const char** aMessage);
void
TXResultToNameAndMessage(nsresult aNSResult,
const char** aName,
const char** aMessage)
{
if (aNSResult == NS_ERROR_DOM_INVALID_EXPRESSION_ERR) {
*aName = kInvalidExpressionErrName;
*aMessage = kInvalidExpressionErrMessage;
}
else if (aNSResult == NS_ERROR_DOM_TYPE_ERR) {
*aName = kTypeErrName;
*aMessage = kTypeErrMessage;
}
else {
NS_WARNING("Huh, someone is throwing non-XPath DOM errors using the XPath DOM module!");
*aName = nsnull;
*aMessage = nsnull;
}
return;
}
IMPL_DOM_EXCEPTION_HEAD(nsXPathException, nsIDOMXPathException)
NS_DECL_NSIDOMXPATHEXCEPTION
IMPL_DOM_EXCEPTION_TAIL(nsXPathException, nsIDOMXPathException, XPathException,
NS_ERROR_MODULE_DOM_XPATH, TXResultToNameAndMessage)
NS_IMETHODIMP
nsXPathException::GetCode(PRUint16* aCode)
{
NS_ENSURE_ARG_POINTER(aCode);
nsresult result;
mBase->GetResult(&result);
*aCode = NS_ERROR_GET_CODE(result);
return NS_OK;
}
NS_IMPL_ISUPPORTS1(nsXPathExceptionProvider, nsIExceptionProvider)
nsXPathExceptionProvider::nsXPathExceptionProvider()
{
}
nsXPathExceptionProvider::~nsXPathExceptionProvider()
{
}
NS_IMETHODIMP
nsXPathExceptionProvider::GetException(nsresult aNSResult,
nsIException *aDefaultException,
nsIException **aException)
{
NS_ENSURE_ARG_POINTER(aException);
NS_NewXPathException(aNSResult, aDefaultException, aException);
NS_ENSURE_TRUE(*aException, NS_ERROR_OUT_OF_MEMORY);
return NS_OK;
}