mkwan 2003/01/22 08:27:24
Modified: java/src/org/apache/xpath NodeSet.java XPathContext.java
java/src/org/apache/xpath/functions FuncId.java FuncSum.java
java/src/org/apache/xpath/objects XNodeSet.java
XRTreeFragSelectWrapper.java
java/src/org/apache/xpath/res XPATHErrorResources.java
XPATHErrorResources_de.java
XPATHErrorResources_es.java
XPATHErrorResources_fr.java
XPATHErrorResources_it.java
XPATHErrorResources_ja.java
XPATHErrorResources_ko.java
XPATHErrorResources_sv.java
XPATHErrorResources_zh_CN.java
XPATHErrorResources_zh_TW.java
Added: java/src/org/apache/xpath/res XPATHMessages.java
Log:
DTM Separation -- changes in org.apache.xpath
1. Change the import path for DOMHelper and DOM2Helper
2. Move 8 errror messages from XPATHErrorResources to XMLErrorResources
3. Create a new XPATHMessages class to handle error resources at
the XPath level.
Revision Changes Path
1.16 +1 -0 xml-xalan/java/src/org/apache/xpath/NodeSet.java
Index: NodeSet.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/NodeSet.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- NodeSet.java 27 Jun 2002 14:50:12 -0000 1.15
+++ NodeSet.java 22 Jan 2003 16:27:22 -0000 1.16
@@ -64,6 +64,7 @@
import org.w3c.dom.DOMException;
import org.apache.xml.utils.NodeVector;
+import org.apache.xml.utils.DOM2Helper;
import org.apache.xpath.axes.ContextNodeList;
import org.apache.xpath.res.XPATHErrorResources;
1.46 +2 -2 xml-xalan/java/src/org/apache/xpath/XPathContext.java
Index: XPathContext.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/XPathContext.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- XPathContext.java 28 Oct 2002 22:41:23 -0000 1.45
+++ XPathContext.java 22 Jan 2003 16:27:22 -0000 1.46
@@ -641,7 +641,7 @@
/** Misnamed string manager for XPath messages. */
- private static XSLMessages m_XSLMessages = new XSLMessages();
+ // private static XSLMessages m_XSLMessages = new XSLMessages();
/**
* Tell the user of an assertion error, and probably throw an
@@ -661,7 +661,7 @@
{
errorHandler.fatalError(
new TransformerException(
- m_XSLMessages.createMessage(
+ XSLMessages.createMessage(
XPATHErrorResources.ER_INCORRECT_PROGRAMMER_ASSERTION,
new Object[]{ msg }), (SAXSourceLocator)this.getSAXLocator()));
}
1.10 +0 -1 xml-xalan/java/src/org/apache/xpath/functions/FuncId.java
Index: FuncId.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncId.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FuncId.java 15 Jun 2001 17:54:24 -0000 1.9
+++ FuncId.java 22 Jan 2003 16:27:22 -0000 1.10
@@ -69,7 +69,6 @@
import java.util.Vector;
import org.apache.xpath.XPathContext;
-import org.apache.xpath.DOMHelper;
import org.apache.xpath.XPath;
import org.apache.xpath.NodeSetDTM;
import org.apache.xpath.objects.XObject;
1.6 +0 -1
xml-xalan/java/src/org/apache/xpath/functions/FuncSum.java
Index: FuncSum.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncSum.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FuncSum.java 12 Jun 2001 19:16:38 -0000 1.5
+++ FuncSum.java 22 Jan 2003 16:27:22 -0000 1.6
@@ -62,7 +62,6 @@
import java.util.Vector;
import org.apache.xpath.XPathContext;
-import org.apache.xpath.DOMHelper;
import org.apache.xpath.XPath;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XNumber;
1.24 +0 -1 xml-xalan/java/src/org/apache/xpath/objects/XNodeSet.java
Index: XNodeSet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XNodeSet.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- XNodeSet.java 27 Nov 2002 17:40:38 -0000 1.23
+++ XNodeSet.java 22 Jan 2003 16:27:22 -0000 1.24
@@ -66,7 +66,6 @@
import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.dtm.DTMManager;
-import org.apache.xpath.DOMHelper;
import org.apache.xpath.XPathContext;
import org.apache.xpath.NodeSetDTM;
import org.apache.xpath.axes.ContextNodeList;
1.8 +0 -1
xml-xalan/java/src/org/apache/xpath/objects/XRTreeFragSelectWrapper.java
Index: XRTreeFragSelectWrapper.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XRTreeFragSelectWrapper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XRTreeFragSelectWrapper.java 22 Dec 2002 23:28:07 -0000 1.7
+++ XRTreeFragSelectWrapper.java 22 Jan 2003 16:27:23 -0000 1.8
@@ -6,7 +6,6 @@
import org.apache.xml.utils.XMLString;
-import org.apache.xpath.DOMHelper;
import org.apache.xpath.XPathContext;
import org.apache.xpath.Expression;
import org.apache.xalan.res.XSLMessages;
1.20 +32 -32
xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources.java
Index: XPATHErrorResources.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XPATHErrorResources.java 10 Jan 2003 02:02:04 -0000 1.19
+++ XPATHErrorResources.java 22 Jan 2003 16:27:23 -0000 1.20
@@ -123,7 +123,7 @@
*/
/** Field MAX_CODE */
- public static final int MAX_CODE = 116; // this is needed to keep track
of the number of messages
+ public static final int MAX_CODE = 108; // this is needed to keep track
of the number of messages
/** Field MAX_WARNING */
public static final int MAX_WARNING = 11; // this is needed to keep track
of the number of warnings
@@ -229,12 +229,12 @@
"ER_SETDOMFACTORY_NOT_SUPPORTED";
public static final String ER_PREFIX_MUST_RESOLVE =
"ER_PREFIX_MUST_RESOLVE";
public static final String ER_PARSE_NOT_SUPPORTED =
"ER_PARSE_NOT_SUPPORTED";
- public static final String ER_CREATEDOCUMENT_NOT_SUPPORTED =
- "ER_CREATEDOCUMENT_NOT_SUPPORTED";
- public static final String ER_CHILD_HAS_NO_OWNER_DOCUMENT =
- "ER_CHILD_HAS_NO_OWNER_DOCUMENT";
- public static final String ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT =
- "ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT";
+ //public static final String ER_CREATEDOCUMENT_NOT_SUPPORTED =
+// "ER_CREATEDOCUMENT_NOT_SUPPORTED";
+ //public static final String ER_CHILD_HAS_NO_OWNER_DOCUMENT =
+// "ER_CHILD_HAS_NO_OWNER_DOCUMENT";
+ //public static final String ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT =
+// "ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT";
public static final String ER_SAX_API_NOT_HANDLED =
"ER_SAX_API_NOT_HANDLED";
public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
"ER_IGNORABLE_WHITESPACE_NOT_HANDLED";
@@ -245,10 +245,10 @@
public static final String ER_XERCES_PARSE_ERROR_DETAILS =
"ER_XERCES_PARSE_ERROR_DETAILS";
public static final String ER_XERCES_PARSE_ERROR = "ER_XERCES_PARSE_ERROR";
- public static final String ER_CANT_OUTPUT_TEXT_BEFORE_DOC =
- "ER_CANT_OUTPUT_TEXT_BEFORE_DOC";
- public static final String ER_CANT_HAVE_MORE_THAN_ONE_ROOT =
- "ER_CANT_HAVE_MORE_THAN_ONE_ROOT";
+ //public static final String ER_CANT_OUTPUT_TEXT_BEFORE_DOC =
+// "ER_CANT_OUTPUT_TEXT_BEFORE_DOC";
+ //public static final String ER_CANT_HAVE_MORE_THAN_ONE_ROOT =
+// "ER_CANT_HAVE_MORE_THAN_ONE_ROOT";
public static final String ER_INVALID_UTF16_SURROGATE =
"ER_INVALID_UTF16_SURROGATE";
public static final String ER_OIERROR = "ER_OIERROR";
@@ -256,7 +256,7 @@
public static final String ER_XPATH_READOBJECT = "ER_XPATH_READOBJECT";
public static final String ER_FUNCTION_TOKEN_NOT_FOUND =
"ER_FUNCTION_TOKEN_NOT_FOUND";
- public static final String ER_ARG_LOCALNAME_NULL = "ER_ARG_LOCALNAME_NULL";
+ //public static final String ER_ARG_LOCALNAME_NULL =
"ER_ARG_LOCALNAME_NULL";
public static final String ER_CANNOT_DEAL_XPATH_TYPE =
"ER_CANNOT_DEAL_XPATH_TYPE";
public static final String ER_NODESET_NOT_MUTABLE =
"ER_NODESET_NOT_MUTABLE";
@@ -333,10 +333,10 @@
public static final String ER_EXPECTED_REL_PATH_PATTERN =
"ER_EXPECTED_REL_PATH_PATTERN";
/** localname in QNAME should be a valid NCName */
- public static final String ER_ARG_LOCALNAME_INVALID =
- "ER_ARG_LOCALNAME_INVALID";
+ //public static final String ER_ARG_LOCALNAME_INVALID =
+// "ER_ARG_LOCALNAME_INVALID";
/** prefix in QNAME should be a valid NCName */
- public static final String ER_ARG_PREFIX_INVALID = "ER_ARG_PREFIX_INVALID";
+ //public static final String ER_ARG_PREFIX_INVALID =
"ER_ARG_PREFIX_INVALID";
/** Field ER_CANT_CONVERT_TO_BOOLEAN */
public static final String ER_CANT_CONVERT_TO_BOOLEAN =
"ER_CANT_CONVERT_TO_BOOLEAN";
@@ -717,20 +717,20 @@
/** Field ER_CREATEDOCUMENT_NOT_SUPPORTED */
// public static final int ER_CREATEDOCUMENT_NOT_SUPPORTED = 54;
- { ER_CREATEDOCUMENT_NOT_SUPPORTED,
- "createDocument() not supported in XPathContext!"},
+ //{ ER_CREATEDOCUMENT_NOT_SUPPORTED,
+ // "createDocument() not supported in XPathContext!"},
/** Field ER_CHILD_HAS_NO_OWNER_DOCUMENT */
// public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT = 55;
- { ER_CHILD_HAS_NO_OWNER_DOCUMENT,
- "Attribute child does not have an owner document!"},
+ //{ ER_CHILD_HAS_NO_OWNER_DOCUMENT,
+ // "Attribute child does not have an owner document!"},
/** Field ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT */
// public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT = 56;
- { ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT,
- "Attribute child does not have an owner document element!"},
+ //{ ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT,
+ // "Attribute child does not have an owner document element!"},
/** Field ER_SAX_API_NOT_HANDLED */
// public static final int ER_SAX_API_NOT_HANDLED = 57;
@@ -771,14 +771,14 @@
/** Field ER_CANT_OUTPUT_TEXT_BEFORE_DOC */
// public static final int ER_CANT_OUTPUT_TEXT_BEFORE_DOC = 63;
- { ER_CANT_OUTPUT_TEXT_BEFORE_DOC,
- "Warning: can't output text before document element! Ignoring..."},
+ //{ ER_CANT_OUTPUT_TEXT_BEFORE_DOC,
+ // "Warning: can't output text before document element! Ignoring..."},
/** Field ER_CANT_HAVE_MORE_THAN_ONE_ROOT */
// public static final int ER_CANT_HAVE_MORE_THAN_ONE_ROOT = 64;
- { ER_CANT_HAVE_MORE_THAN_ONE_ROOT,
- "Can't have more than one root on a DOM!"},
+ //{ ER_CANT_HAVE_MORE_THAN_ONE_ROOT,
+ // "Can't have more than one root on a DOM!"},
/** Field ER_INVALID_UTF16_SURROGATE */
// public static final int ER_INVALID_UTF16_SURROGATE = 65;
@@ -804,7 +804,7 @@
{ ER_XPATH_READOBJECT,
"In XPath.readObject: {0}"},
- /** Field ER_XPATH_READOBJECT */
+ /** Field ER_FUNCTION_TOKEN_NOT_FOUND */
// public static final int ER_FUNCTION_TOKEN_NOT_FOUND = 69;
{ ER_FUNCTION_TOKEN_NOT_FOUND,
@@ -813,8 +813,8 @@
/** Argument 'localName' is null */
// public static final int ER_ARG_LOCALNAME_NULL = 70;
- { ER_FUNCTION_TOKEN_NOT_FOUND,
- "Argument 'localName' is null"},
+ //{ ER_ARG_LOCALNAME_NULL,
+ // "Argument 'localName' is null"},
/** Can not deal with XPath type: */
// public static final int ER_CANNOT_DEAL_XPATH_TYPE = 71;
@@ -1030,8 +1030,8 @@
/** localname in QNAME should be a valid NCName */
// public static final int ER_ARG_LOCALNAME_INVALID = 101;
- { ER_ARG_LOCALNAME_INVALID,
- "Localname in QNAME should be a valid NCName"},
+ //{ ER_ARG_LOCALNAME_INVALID,
+ // "Localname in QNAME should be a valid NCName"},
// Note to translators: A QNAME has the syntactic form [NCName:]NCName
// The prefix is the portion before the optional colon; the message
indicates
@@ -1040,8 +1040,8 @@
/** prefix in QNAME should be a valid NCName */
// public static final int ER_ARG_PREFIX_INVALID = 102;
- { ER_ARG_PREFIX_INVALID,
- "Prefix in QNAME should be a valid NCName"},
+ //{ ER_ARG_PREFIX_INVALID,
+ // "Prefix in QNAME should be a valid NCName"},
// Note to translators: The substitution text is the name of a data type.
The
// message indicates that a value of a particular type could not be
converted
1.3 +1 -79
xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_de.java
Index: XPATHErrorResources_de.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_de.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPATHErrorResources_de.java 10 Jan 2003 02:02:04 -0000 1.2
+++ XPATHErrorResources_de.java 22 Jan 2003 16:27:23 -0000 1.3
@@ -79,7 +79,7 @@
/** Field MAX_CODE */
- public static final int MAX_CODE = 116; // this is needed to keep track
of the number of messages
+ public static final int MAX_CODE = 108; // this is needed to keep track
of the number of messages
/** Field MAX_WARNING */
public static final int MAX_WARNING = 11; // this is needed to keep track
of the number of warnings
@@ -567,32 +567,6 @@
"Parsen von (InputSource Quelle) in XpathContext nicht
unterst\u00fctzt! {0} kann nicht ge\u00f6ffnet werden"},
- /** Field ER_CREATEDOCUMENT_NOT_SUPPORTED */
- //public static final int ER_CREATEDOCUMENT_NOT_SUPPORTED = 54;
-
-
- {
- ER_CREATEDOCUMENT_NOT_SUPPORTED,
- "createDocument() in XpathContext nicht unterst\u00fctzt!"},
-
-
- /** Field ER_CHILD_HAS_NO_OWNER_DOCUMENT */
- //public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT = 55;
-
-
- {
- ER_CHILD_HAS_NO_OWNER_DOCUMENT,
- "Attribut-Tochterknoten hat kein Eigent\u00fcmer-Dokument!"},
-
-
- /** Field ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT */
- //public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT = 56;
-
-
- {
- ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT,
- "Attribut-Tochterknoten hat kein Element Eigent\u00fcmer-Dokument!"},
-
/** Field ER_SAX_API_NOT_HANDLED */
//public static final int ER_SAX_API_NOT_HANDLED = 57;
@@ -647,23 +621,6 @@
ER_XERCES_PARSE_ERROR, "Fehler bei DOM2Helper.parse"},
- /** Field ER_CANT_OUTPUT_TEXT_BEFORE_DOC */
- //public static final int ER_CANT_OUTPUT_TEXT_BEFORE_DOC = 63;
-
-
- {
- ER_CANT_OUTPUT_TEXT_BEFORE_DOC,
- "Warnung: Vor einem Dokumentelement kann kein Text ausgegeben werden!
Wird ignoriert..."},
-
-
- /** Field ER_CANT_HAVE_MORE_THAN_ONE_ROOT */
- //public static final int ER_CANT_HAVE_MORE_THAN_ONE_ROOT = 64;
-
-
- {
- ER_CANT_HAVE_MORE_THAN_ONE_ROOT,
- "Ein DOM kann nur einen Stamm haben!"},
-
/** Field ER_INVALID_UTF16_SURROGATE */
//public static final int ER_INVALID_UTF16_SURROGATE = 65;
@@ -708,15 +665,6 @@
"Funktions-Token nicht gefunden."},
- /** Argument 'localName' is null */
- //public static final int ER_ARG_LOCALNAME_NULL = 70;
-
-
- {
- ER_ARG_LOCALNAME_NULL,
- "Argument 'localName' ist Null"},
-
-
/** Can not deal with XPath type: */
//public static final int ER_CANNOT_DEAL_XPATH_TYPE = 71;
@@ -1011,32 +959,6 @@
{
ER_EXPECTED_REL_PATH_PATTERN,
"Es wurde ein relatives Pfadmuster erwartet."},
-
-
- // Note to translators: A QNAME has the syntactic form [NCName:]NCName
- // The localname is the portion after the optional colon; the message
indicates
- // that there is a problem with that part of the QNAME.
-
- /** localname in QNAME should be a valid NCName */
- //public static final int ER_ARG_LOCALNAME_INVALID = 101;
-
-
- {
- ER_ARG_LOCALNAME_INVALID,
- "Der lokale Name in QNAME muss einem g\u00fcltigen 'NCName'
entsprechen."},
-
-
- // Note to translators: A QNAME has the syntactic form [NCName:]NCName
- // The prefix is the portion before the optional colon; the message
indicates
- // that there is a problem with that part of the QNAME.
-
- /** prefix in QNAME should be a valid NCName */
- //public static final int ER_ARG_PREFIX_INVALID = 102;
-
-
- {
- ER_ARG_PREFIX_INVALID,
- "Das Pr\u00e4fix in QNAME muss einem g\u00fcltigen 'NCName'
entsprechen."},
// Note to translators: The substitution text is the name of a data type.
The
1.3 +1 -81
xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_es.java
Index: XPATHErrorResources_es.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_es.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPATHErrorResources_es.java 10 Jan 2003 02:02:04 -0000 1.2
+++ XPATHErrorResources_es.java 22 Jan 2003 16:27:23 -0000 1.3
@@ -80,7 +80,7 @@
/** Field MAX_CODE */
- public static final int MAX_CODE = 116; // this is needed to keep track
of the number of messages
+ public static final int MAX_CODE = 108; // this is needed to keep track
of the number of messages
/** Field MAX_WARNING */
public static final int MAX_WARNING = 11; // this is needed to keep track
of the number of warnings
@@ -568,33 +568,6 @@
"an\u00e1lisis sint\u00e1ctico (fuente InputSource source) no
admitido! No se puede abri {0}"},
- /** Field ER_CREATEDOCUMENT_NOT_SUPPORTED */
- //public static final int ER_CREATEDOCUMENT_NOT_SUPPORTED = 54;
-
-
- {
- ER_CREATEDOCUMENT_NOT_SUPPORTED,
- "createDocument no admitido en XPathContext."},
-
-
- /** Field ER_CHILD_HAS_NO_OWNER_DOCUMENT */
- //public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT = 55;
-
-
- {
- ER_CHILD_HAS_NO_OWNER_DOCUMENT,
- "El atributo hijo no tiene documento propietario!"},
-
-
- /** Field ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT */
- //public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT = 56;
-
-
- {
- ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT,
- "El atributo hijo no tiene elemento de documento propietario!"},
-
-
/** Field ER_SAX_API_NOT_HANDLED */
//public static final int ER_SAX_API_NOT_HANDLED = 57;
@@ -648,24 +621,6 @@
ER_XERCES_PARSE_ERROR, "Error DOM2Helper.parse."},
- /** Field ER_CANT_OUTPUT_TEXT_BEFORE_DOC */
- //public static final int ER_CANT_OUTPUT_TEXT_BEFORE_DOC = 63;
-
-
- {
- ER_CANT_OUTPUT_TEXT_BEFORE_DOC,
- "Advertencia: no puede enviar el texto antes del elemento de
documento. Se ignora..."},
-
-
- /** Field ER_CANT_HAVE_MORE_THAN_ONE_ROOT */
- //public static final int ER_CANT_HAVE_MORE_THAN_ONE_ROOT = 64;
-
-
- {
- ER_CANT_HAVE_MORE_THAN_ONE_ROOT,
- "No puede haber m\u00e1s de una ra\u00edz en un DOM."},
-
-
/** Field ER_INVALID_UTF16_SURROGATE */
//public static final int ER_INVALID_UTF16_SURROGATE = 65;
@@ -708,15 +663,6 @@
"No se ha encontrado el token de funci\u00f3n."},
- /** Argument 'localName' is null */
- //public static final int ER_ARG_LOCALNAME_NULL = 70;
-
-
- {
- ER_ARG_LOCALNAME_NULL,
- "El argumentoArgument 'localName' es nulo."},
-
-
/** Can not deal with XPath type: */
//public static final int ER_CANNOT_DEAL_XPATH_TYPE = 71;
@@ -1011,32 +957,6 @@
{
ER_EXPECTED_REL_PATH_PATTERN,
"Se esperaba un patr\u00f3n de pasos relativo."},
-
-
- // Note to translators: A QNAME has the syntactic form [NCName:]NCName
- // The localname is the portion after the optional colon; the message
indicates
- // that there is a problem with that part of the QNAME.
-
- /** localname in QNAME should be a valid NCName */
- //public static final int ER_ARG_LOCALNAME_INVALID = 101;
-
-
- {
- ER_ARG_LOCALNAME_INVALID,
- "El nombre local especificado en QNAME debe ser un nombre NCName
v\u00e1lido"},
-
-
- // Note to translators: A QNAME has the syntactic form [NCName:]NCName
- // The prefix is the portion before the optional colon; the message
indicates
- // that there is a problem with that part of the QNAME.
-
- /** prefix in QNAME should be a valid NCName */
- //public static final int ER_ARG_PREFIX_INVALID = 102;
-
-
- {
- ER_ARG_PREFIX_INVALID,
- "El prefijo especificado en QNAME debe ser un nombre NCName
v\u00e1lido"},
// Note to translators: The substitution text is the name of a data type.
The
1.3 +1 -81
xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_fr.java
Index: XPATHErrorResources_fr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_fr.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPATHErrorResources_fr.java 10 Jan 2003 02:02:04 -0000 1.2
+++ XPATHErrorResources_fr.java 22 Jan 2003 16:27:23 -0000 1.3
@@ -79,7 +79,7 @@
{
/** Field MAX_CODE */
- public static final int MAX_CODE = 116; // this is needed to keep track
of the number of messages
+ public static final int MAX_CODE = 108; // this is needed to keep track
of the number of messages
/** Field MAX_WARNING */
public static final int MAX_WARNING = 11; // this is needed to keep track
of the number of warnings
@@ -567,33 +567,6 @@
"parse (source InputSource) non pris en charge dans XpathContext !
Impossible d\u2019ouvrir {0}"},
- /** Field ER_CREATEDOCUMENT_NOT_SUPPORTED */
- //public static final int ER_CREATEDOCUMENT_NOT_SUPPORTED = 54;
-
-
- {
- ER_CREATEDOCUMENT_NOT_SUPPORTED,
- "createDocument() non pris en charge dans XpathContext !"},
-
-
- /** Field ER_CHILD_HAS_NO_OWNER_DOCUMENT */
- //public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT = 55;
-
-
- {
- ER_CHILD_HAS_NO_OWNER_DOCUMENT,
- "L\u2019attribut child n\u2019a pas de document propri\u00e9taire !"},
-
-
- /** Field ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT */
- //public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT = 56;
-
-
- {
- ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT,
- "L\u2019attribute child n\u2019a pas d\u2019\u00e9l\u00e9ment de
document propri\u00e9taire !"},
-
-
/** Field ER_SAX_API_NOT_HANDLED */
//public static final int ER_SAX_API_NOT_HANDLED = 57;
@@ -647,24 +620,6 @@
ER_XERCES_PARSE_ERROR, "Erreur DOM2Helper.parse"},
- /** Field ER_CANT_OUTPUT_TEXT_BEFORE_DOC */
- //public static final int ER_CANT_OUTPUT_TEXT_BEFORE_DOC = 63;
-
-
- {
- ER_CANT_OUTPUT_TEXT_BEFORE_DOC,
- "Attention : impossible de sortir le texte avant
l\u2019\u00e9l\u00e9ment document ! Op\u00e9ration ignor\u00e9e ..."},
-
-
- /** Field ER_CANT_HAVE_MORE_THAN_ONE_ROOT */
- //public static final int ER_CANT_HAVE_MORE_THAN_ONE_ROOT = 64;
-
-
- {
- ER_CANT_HAVE_MORE_THAN_ONE_ROOT,
- "Impossible d\u2019avoir plus d\u2019une racine sur un DOM !"},
-
-
/** Field ER_INVALID_UTF16_SURROGATE */
//public static final int ER_INVALID_UTF16_SURROGATE = 65;
@@ -707,15 +662,6 @@
"Unit\u00e9 lexicale function introuvable."},
- /** Argument 'localName' is null */
- //public static final int ER_ARG_LOCALNAME_NULL = 70;
-
-
- {
- ER_ARG_LOCALNAME_NULL,
- "L\u2019argument 'localName' est \u00e9gal \u00e0 null"},
-
-
/** Can not deal with XPath type: */
//public static final int ER_CANNOT_DEAL_XPATH_TYPE = 71;
@@ -1010,32 +956,6 @@
{
ER_EXPECTED_REL_PATH_PATTERN,
"Une forme de chemin d'acc\u00e8s relatif \u00e9tait attendue."},
-
-
-// Note to translators: A QNAME has the syntactic form [NCName:]NCName
- // The localname is the portion after the optional colon; the message
indicates
- // that there is a problem with that part of the QNAME.
-
- /** localname in QNAME should be a valid NCName */
- //public static final int ER_ARG_LOCALNAME_INVALID = 101;
-
-
- {
- ER_ARG_LOCALNAME_INVALID,
- "Le nom local de QNAME doit \u00eatre un NCName admis"},
-
-
-// Note to translators: A QNAME has the syntactic form [NCName:]NCName
- // The prefix is the portion before the optional colon; the message
indicates
- // that there is a problem with that part of the QNAME.
-
- /** prefix in QNAME should be a valid NCName */
- //public static final int ER_ARG_PREFIX_INVALID = 102;
-
-
- {
- ER_ARG_PREFIX_INVALID,
- "Le pr\u00e9fixe de QNAME doit \u00eatre un NCName admis"},
// Note to translators: The substitution text is the name of a data type.
The
1.3 +1 -81
xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_it.java
Index: XPATHErrorResources_it.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_it.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPATHErrorResources_it.java 10 Jan 2003 02:02:04 -0000 1.2
+++ XPATHErrorResources_it.java 22 Jan 2003 16:27:23 -0000 1.3
@@ -80,7 +80,7 @@
/** Field MAX_CODE */
- public static final int MAX_CODE = 116; // this is needed to keep track of
the number of messages
+ public static final int MAX_CODE = 108; // this is needed to keep track of
the number of messages
/** Field MAX_WARNING */
public static final int MAX_WARNING = 11; // this is needed to keep track
of the number of warnings
@@ -568,33 +568,6 @@
"analisi (sorgente InputSource) non supportata in XPathContext.
Impossibile aprire {0}"},
- /** Field ER_CREATEDOCUMENT_NOT_SUPPORTED */
- //public static final int ER_CREATEDOCUMENT_NOT_SUPPORTED = 54;
-
-
- {
- ER_CREATEDOCUMENT_NOT_SUPPORTED,
- "createDocument() non supportato in XPathContext."},
-
-
- /** Field ER_CHILD_HAS_NO_OWNER_DOCUMENT */
- //public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT = 55;
-
-
- {
- ER_CHILD_HAS_NO_OWNER_DOCUMENT,
- "L'elemento secondario dell'attributo non ha un documento di
propriet\u00e0."},
-
-
- /** Field ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT */
- //public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT = 56;
-
-
- {
- ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT,
- "L'elemento secondario dell'attributo non ha un elemento del documento
di propriet\u00e0."},
-
-
/** Field ER_SAX_API_NOT_HANDLED */
//public static final int ER_SAX_API_NOT_HANDLED = 57;
@@ -648,24 +621,6 @@
ER_XERCES_PARSE_ERROR, "Errore DOM2Helper.parse"},
- /** Field ER_CANT_OUTPUT_TEXT_BEFORE_DOC */
- //public static final int ER_CANT_OUTPUT_TEXT_BEFORE_DOC = 63;
-
-
- {
- ER_CANT_OUTPUT_TEXT_BEFORE_DOC,
- "Avvertenza: impossibile generare un output di testo prima
dell'elemento documento. Richiesta ignorata..."},
-
-
- /** Field ER_CANT_HAVE_MORE_THAN_ONE_ROOT */
- //public static final int ER_CANT_HAVE_MORE_THAN_ONE_ROOT = 64;
-
-
- {
- ER_CANT_HAVE_MORE_THAN_ONE_ROOT,
- "Impossibile avere pi\u00f9 di una root su un DOM."},
-
-
/** Field ER_INVALID_UTF16_SURROGATE */
//public static final int ER_INVALID_UTF16_SURROGATE = 65;
@@ -708,15 +663,6 @@
"token di funzione non trovato."},
- /** Argument 'localName' is null */
- //public static final int ER_ARG_LOCALNAME_NULL = 70;
-
-
- {
- ER_ARG_LOCALNAME_NULL,
- "L'argomento 'localName' \u00e8 nullo"},
-
-
/** Can not deal with XPath type: */
//public static final int ER_CANNOT_DEAL_XPATH_TYPE = 71;
@@ -1010,32 +956,6 @@
{
ER_EXPECTED_REL_PATH_PATTERN,
"Atteso pattern percorso relativo."},
-
-
- // Note to translators: A QNAME has the syntactic form [NCName:]NCName
- // The localname is the portion after the optional colon; the message
indicates
- // that there is a problem with that part of the QNAME.
-
- /** localname in QNAME should be a valid NCName */
- //public static final int ER_ARG_LOCALNAME_INVALID = 101;
-
-
- {
- ER_ARG_LOCALNAME_INVALID,
- "Localname in QNAME deve essere un NCName valido"},
-
-
- // Note to translators: A QNAME has the syntactic form [NCName:]NCName
- // The prefix is the portion before the optional colon; the message
indicates
- // that there is a problem with that part of the QNAME.
-
- /** prefix in QNAME should be a valid NCName */
- //public static final int ER_ARG_PREFIX_INVALID = 102;
-
-
- {
- ER_ARG_PREFIX_INVALID,
- "Prefisso in QNAME deve essere un NCName valido"},
// Note to translators: The substitution text is the name of a data
type. The
1.3 +1 -87
xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_ja.java
Index: XPATHErrorResources_ja.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_ja.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPATHErrorResources_ja.java 10 Jan 2003 02:02:04 -0000 1.2
+++ XPATHErrorResources_ja.java 22 Jan 2003 16:27:23 -0000 1.3
@@ -80,7 +80,7 @@
/** Field MAX_CODE */
- public static final int MAX_CODE = 116; // this is needed to keep track
of the number of messages
+ public static final int MAX_CODE = 108; // this is needed to keep track
of the number of messages
/** Field MAX_WARNING */
public static final int MAX_WARNING = 11; // this is needed to keep track
of the number of warnings
@@ -621,36 +621,6 @@
// "parse (InputSource source) not supported in XPathContext! Can not
open {0}"},
- /** Field ER_CREATEDOCUMENT_NOT_SUPPORTED */
- //public static final int ER_CREATEDOCUMENT_NOT_SUPPORTED = 54;
-
-
- {
- ER_CREATEDOCUMENT_NOT_SUPPORTED,
- "createDocument() \u306f XPathContext
\u3067\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002"},
-// "createDocument() not supported in XPathContext!"},
-
-
- /** Field ER_CHILD_HAS_NO_OWNER_DOCUMENT */
- //public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT = 55;
-
-
- {
- ER_CHILD_HAS_NO_OWNER_DOCUMENT,
- "\u5c5e\u6027 child
\u306f\u6240\u6709\u8005\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u4fdd\u6301\u3057\u3066\u3044\u307e\u305b\u3093\u3002"},
-// "Attribute child does not have an owner document!"},
-
-
- /** Field ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT */
- //public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT = 56;
-
-
- {
- ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT,
- "\u5c5e\u6027 child
\u306f\u6240\u6709\u8005\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u8981\u7d20\u3092\u4fdd\u6301\u3057\u3066\u3044\u307e\u305b\u3093\u3002"},
-// "Attribute child does not have an owner document element!"},
-
-
/** Field ER_SAX_API_NOT_HANDLED */
//public static final int ER_SAX_API_NOT_HANDLED = 57;
@@ -710,26 +680,6 @@
// ER_XERCES_PARSE_ERROR, "DOM2Helper.parse error"},
- /** Field ER_CANT_OUTPUT_TEXT_BEFORE_DOC */
- //public static final int ER_CANT_OUTPUT_TEXT_BEFORE_DOC = 63;
-
-
- {
- ER_CANT_OUTPUT_TEXT_BEFORE_DOC,
- "\u8b66\u544a:
\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u8981\u7d20\u3088\u308a\u524d\u306b\u30c6\u30ad\u30b9\u30c8\u3092\u51fa\u529b\u3067\u304d\u307e\u305b\u3093\u3002\u7121\u8996\u3057\u307e\u3059..."},
-// "Warning: can't output text before document element! Ignoring..."},
-
-
- /** Field ER_CANT_HAVE_MORE_THAN_ONE_ROOT */
- //public static final int ER_CANT_HAVE_MORE_THAN_ONE_ROOT = 64;
-
-
- {
- ER_CANT_HAVE_MORE_THAN_ONE_ROOT,
- "DOM
\u306b\u306f\u8907\u6570\u306e\u30eb\u30fc\u30c8\u3092\u4fdd\u6301\u3067\u304d\u307e\u305b\u3093\u3002"},
-// "Can't have more than one root on a DOM!"},
-
-
/** Field ER_INVALID_UTF16_SURROGATE */
//public static final int ER_INVALID_UTF16_SURROGATE = 65;
@@ -777,16 +727,6 @@
// "function token not found."},
- /** Argument 'localName' is null */
- //public static final int ER_ARG_LOCALNAME_NULL = 70;
-
-
- {
- ER_ARG_LOCALNAME_NULL,
- "\u5f15\u6570 'localName' \u304c null \u3067\u3059"},
-// "Argument 'localName' is null"},
-
-
/** Can not deal with XPath type: */
//public static final int ER_CANNOT_DEAL_XPATH_TYPE = 71;
@@ -1096,32 +1036,6 @@
{
ER_EXPECTED_REL_PATH_PATTERN,
"\u25bc\u76f8\u5bfe\u30d1\u30b9\u30d1\u30bf\u30fc\u30f3\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002"},
-
-
- // Note to translators: A QNAME has the syntactic form [NCName:]NCName
- // The localname is the portion after the optional colon; the message
indicates
- // that there is a problem with that part of the QNAME.
-
- /** localname in QNAME should be a valid NCName */
- //public static final int ER_ARG_LOCALNAME_INVALID = 101;
-
-
- {
- ER_ARG_LOCALNAME_INVALID,
- "\u25bcQNAME
\u5185\u306e\u30ed\u30fc\u30ab\u30eb\u540d\u306f\u6709\u52b9\u306a NCName
\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093"},
-
-
- // Note to translators: A QNAME has the syntactic form [NCName:]NCName
- // The prefix is the portion before the optional colon; the message
indicates
- // that there is a problem with that part of the QNAME.
-
- /** prefix in QNAME should be a valid NCName */
- //public static final int ER_ARG_PREFIX_INVALID = 102;
-
-
- {
- ER_ARG_PREFIX_INVALID,
- "\u25bcQNAME \u5185\u306e\u63a5\u982d\u8f9e\u306f\u6709\u52b9\u306a
NCName \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093"},
// Note to translators: The substitution text is the name of a data type.
The
1.3 +1 -81
xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_ko.java
Index: XPATHErrorResources_ko.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_ko.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPATHErrorResources_ko.java 10 Jan 2003 02:02:04 -0000 1.2
+++ XPATHErrorResources_ko.java 22 Jan 2003 16:27:23 -0000 1.3
@@ -80,7 +80,7 @@
/** Field MAX_CODE */
- public static final int MAX_CODE = 116; // this is needed to keep track
of the number of messages
+ public static final int MAX_CODE = 108; // this is needed to keep track
of the number of messages
/** Field MAX_WARNING */
public static final int MAX_WARNING = 11; // this is needed to keep track
of the number of warnings
@@ -568,33 +568,6 @@
"\uad6c\ubb38 \ubd84\uc11d(InputSource \uc18c\uc2a4)\uc740
XPathContext\uc5d0\uc11c \uc9c0\uc6d0\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4!
{0}\uc744(\ub97c) \uc5f4 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. "},
- /** Field ER_CREATEDOCUMENT_NOT_SUPPORTED */
- //public static final int ER_CREATEDOCUMENT_NOT_SUPPORTED = 54;
-
-
- {
- ER_CREATEDOCUMENT_NOT_SUPPORTED,
- "createDocument()\ub294 XPathContext\uc5d0\uc11c
\uc9c0\uc6d0\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4!"},
-
-
- /** Field ER_CHILD_HAS_NO_OWNER_DOCUMENT */
- //public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT = 55;
-
-
- {
- ER_CHILD_HAS_NO_OWNER_DOCUMENT,
- "\uc790\uc2dd \uc18d\uc131\uc5d0 \uc18c\uc720\uc790 \ubb38\uc11c\uac00
\uc5c6\uc2b5\ub2c8\ub2e4!"},
-
-
- /** Field ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT */
- //public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT = 56;
-
-
- {
- ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT,
- "\uc790\uc2dd \uc18d\uc131\uc5d0 \uc18c\uc720\uc790 \ubb38\uc11c
\uc694\uc18c\uac00 \uc5c6\uc2b5\ub2c8\ub2e4!"},
-
-
/** Field ER_SAX_API_NOT_HANDLED */
//public static final int ER_SAX_API_NOT_HANDLED = 57;
@@ -648,24 +621,6 @@
ER_XERCES_PARSE_ERROR, "DOM2Helper.parse \uc624\ub958"},
- /** Field ER_CANT_OUTPUT_TEXT_BEFORE_DOC */
- //public static final int ER_CANT_OUTPUT_TEXT_BEFORE_DOC = 63;
-
-
- {
- ER_CANT_OUTPUT_TEXT_BEFORE_DOC,
- "\uacbd\uace0: \ubb38\uc11c \uc694\uc18c \uc804\uc5d0
\ud14d\uc2a4\ud2b8\ub97c \ucd9c\ub825\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4!
\ubb34\uc2dc\ub429\ub2c8\ub2e4..."},
-
-
- /** Field ER_CANT_HAVE_MORE_THAN_ONE_ROOT */
- //public static final int ER_CANT_HAVE_MORE_THAN_ONE_ROOT = 64;
-
-
- {
- ER_CANT_HAVE_MORE_THAN_ONE_ROOT,
- "DOM\uc5d0 \ub450 \uac1c \uc774\uc0c1\uc758 \ub8e8\ud2b8\ub97c
\uac00\uc9c8 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4!"},
-
-
/** Field ER_INVALID_UTF16_SURROGATE */
//public static final int ER_INVALID_UTF16_SURROGATE = 65;
@@ -708,15 +663,6 @@
"\uae30\ub2a5 \ud1a0\ud070\uc744 \ucc3e\uc744 \uc218
\uc5c6\uc2b5\ub2c8\ub2e4."},
- /** Argument 'localName' is null */
- //public static final int ER_ARG_LOCALNAME_NULL = 70;
-
-
- {
- ER_ARG_LOCALNAME_NULL,
- "'localName' \uc778\uc790\uac00 \ub110\uc785\ub2c8\ub2e4"},
-
-
/** Can not deal with XPath type: */
//public static final int ER_CANNOT_DEAL_XPATH_TYPE = 71;
@@ -1011,32 +957,6 @@
{
ER_EXPECTED_REL_PATH_PATTERN,
"\uc0c1\ub300 \uacbd\ub85c \ud328\ud134\uc774 \uc640\uc57c
\ud569\ub2c8\ub2e4."},
-
-
- // Note to translators: A QNAME has the syntactic form [NCName:]NCName
- // The localname is the portion after the optional colon; the message
indicates
- // that there is a problem with that part of the QNAME.
-
- /** localname in QNAME should be a valid NCName */
- //public static final int ER_ARG_LOCALNAME_INVALID = 101;
-
-
- {
- ER_ARG_LOCALNAME_INVALID,
- "QNAME\uc758 \ub85c\uceec \uc774\ub984\uc740 \uc720\ud6a8\ud55c
NCName\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4."},
-
-
- // Note to translators: A QNAME has the syntactic form [NCName:]NCName
- // The prefix is the portion before the optional colon; the message
indicates
- // that there is a problem with that part of the QNAME.
-
- /** prefix in QNAME should be a valid NCName */
- //public static final int ER_ARG_PREFIX_INVALID = 102;
-
-
- {
- ER_ARG_PREFIX_INVALID,
- "QNAME\uc758 \uc811\ub450\uc5b4\ub294 \uc720\ud6a8\ud55c
NCName\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4."},
// Note to translators: The substitution text is the name of a data type.
The
1.3 +1 -81
xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_sv.java
Index: XPATHErrorResources_sv.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_sv.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPATHErrorResources_sv.java 10 Jan 2003 02:02:04 -0000 1.2
+++ XPATHErrorResources_sv.java 22 Jan 2003 16:27:23 -0000 1.3
@@ -80,7 +80,7 @@
/** Field MAX_CODE */
-public static final int MAX_CODE = 116; // this is needed to keep track of
the number of messages
+public static final int MAX_CODE = 108; // this is needed to keep track of
the number of messages
/** Field MAX_WARNING */
public static final int MAX_WARNING = 11; // this is needed to keep track
of the number of warnings
@@ -568,33 +568,6 @@
"parse (InputSource source) underst\u00f6ds inte av XPathContext! Kan
inte \u00f6ppna {0}"},
- /** Field ER_CREATEDOCUMENT_NOT_SUPPORTED */
- //public static final int ER_CREATEDOCUMENT_NOT_SUPPORTED = 54;
-
-
- {
- ER_CREATEDOCUMENT_NOT_SUPPORTED,
- "createDocument() underst\u00f6ds inte av XPathContext!"},
-
-
- /** Field ER_CHILD_HAS_NO_OWNER_DOCUMENT */
- //public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT = 55;
-
-
- {
- ER_CHILD_HAS_NO_OWNER_DOCUMENT,
- "Attributbarn saknar \u00e4gardokument!"},
-
-
- /** Field ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT */
- //public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT = 56;
-
-
- {
- ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT,
- "Attributbarn saknar \u00e4gardokumentelement!"},
-
-
/** Field ER_SAX_API_NOT_HANDLED */
//public static final int ER_SAX_API_NOT_HANDLED = 57;
@@ -648,24 +621,6 @@
ER_XERCES_PARSE_ERROR, "DOM2Helper.parse-fel"},
- /** Field ER_CANT_OUTPUT_TEXT_BEFORE_DOC */
- //public static final int ER_CANT_OUTPUT_TEXT_BEFORE_DOC = 63;
-
-
- {
- ER_CANT_OUTPUT_TEXT_BEFORE_DOC,
- "Varning: kan inte skriva ut text innan dokumentelement!
Ignorerar..."},
-
-
- /** Field ER_CANT_HAVE_MORE_THAN_ONE_ROOT */
- //public static final int ER_CANT_HAVE_MORE_THAN_ONE_ROOT = 64;
-
-
- {
- ER_CANT_HAVE_MORE_THAN_ONE_ROOT,
- "Kan inte ha mer \u00e4n en rot p\u00e5 en DOM!"},
-
-
/** Field ER_INVALID_UTF16_SURROGATE */
//public static final int ER_INVALID_UTF16_SURROGATE = 65;
@@ -708,15 +663,6 @@
"funktionstecken saknas."},
- /** Argument 'localName' is null */
- //public static final int ER_ARG_LOCALNAME_NULL = 70;
-
-
- {
- ER_ARG_LOCALNAME_NULL,
- "Argument 'localName' \u00e4r null"},
-
-
/** Can not deal with XPath type: */
//public static final int ER_CANNOT_DEAL_XPATH_TYPE = 71;
@@ -1011,32 +957,6 @@
{
ER_EXPECTED_REL_PATH_PATTERN,
"Ett m\u00f6nster f\u00f6r relativ s\u00f6kv\u00e4g
f\u00f6rv\u00e4ntades."},
-
-
- // Note to translators: A QNAME has the syntactic form [NCName:]NCName
- // The localname is the portion after the optional colon; the message
indicates
- // that there is a problem with that part of the QNAME.
-
- /** localname in QNAME should be a valid NCName */
- //public static final int ER_ARG_LOCALNAME_INVALID = 101;
-
-
- {
- ER_ARG_LOCALNAME_INVALID,
- "Localname i QNAME b\u00f6r vara ett giltigt NCName"},
-
-
- // Note to translators: A QNAME has the syntactic form [NCName:]NCName
- // The prefix is the portion before the optional colon; the message
indicates
- // that there is a problem with that part of the QNAME.
-
- /** prefix in QNAME should be a valid NCName */
- //public static final int ER_ARG_PREFIX_INVALID = 102;
-
-
- {
- ER_ARG_PREFIX_INVALID,
- "Prefixet i QNAME b\u00f6r vara ett giltigt NCName"},
// Note to translators: The substitution text is the name of a data type.
The
1.3 +1 -81
xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_zh_CN.java
Index: XPATHErrorResources_zh_CN.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_zh_CN.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPATHErrorResources_zh_CN.java 10 Jan 2003 02:02:04 -0000 1.2
+++ XPATHErrorResources_zh_CN.java 22 Jan 2003 16:27:23 -0000 1.3
@@ -80,7 +80,7 @@
/** Field MAX_CODE */
- public static final int MAX_CODE = 116; // this is needed to keep track
of the number of messages
+ public static final int MAX_CODE = 108; // this is needed to keep track
of the number of messages
/** Field MAX_WARNING */
public static final int MAX_WARNING = 11; // this is needed to keep track
of the number of warnings
@@ -568,33 +568,6 @@
"XPathContext
\u4e2d\u4e0d\u652f\u6301\uff08\u8bed\u6cd5\uff09\u5206\u6790\u5668\uff08InputSource
\u6e90\uff09\uff01\u65e0\u6cd5\u6253\u5f00 {0}"},
- /** Field ER_CREATEDOCUMENT_NOT_SUPPORTED */
- //public static final int ER_CREATEDOCUMENT_NOT_SUPPORTED = 54;
-
-
- {
- ER_CREATEDOCUMENT_NOT_SUPPORTED,
- "XPathContext \u4e2d\u4e0d\u652f\u6301 createDocument()\uff01"},
-
-
- /** Field ER_CHILD_HAS_NO_OWNER_DOCUMENT */
- //public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT = 55;
-
-
- {
- ER_CHILD_HAS_NO_OWNER_DOCUMENT,
- "\u5b50\u5c5e\u6027\u6ca1\u6709\u5c5e\u4e3b\u6587\u6863\uff01"},
-
-
- /** Field ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT */
- //public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT = 56;
-
-
- {
- ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT,
-
"\u5b50\u5c5e\u6027\u6ca1\u6709\u5c5e\u4e3b\u6587\u6863\u5143\u7d20\uff01"},
-
-
/** Field ER_SAX_API_NOT_HANDLED */
//public static final int ER_SAX_API_NOT_HANDLED = 57;
@@ -648,24 +621,6 @@
ER_XERCES_PARSE_ERROR, "DOM2Helper.parse \u9519\u8bef"},
- /** Field ER_CANT_OUTPUT_TEXT_BEFORE_DOC */
- //public static final int ER_CANT_OUTPUT_TEXT_BEFORE_DOC = 63;
-
-
- {
- ER_CANT_OUTPUT_TEXT_BEFORE_DOC,
-
"\u8b66\u544a\uff1a\u4e0d\u80fd\u8f93\u51fa\u6587\u6863\u5143\u7d20\u4e4b\u524d\u7684\u6587\u5b57\uff01\u5ffd\u7565..."},
-
-
- /** Field ER_CANT_HAVE_MORE_THAN_ONE_ROOT */
- //public static final int ER_CANT_HAVE_MORE_THAN_ONE_ROOT = 64;
-
-
- {
- ER_CANT_HAVE_MORE_THAN_ONE_ROOT,
- "DOM \u4e0a\u4e0d\u80fd\u6709\u591a\u4e2a\u6839\uff01"},
-
-
/** Field ER_INVALID_UTF16_SURROGATE */
//public static final int ER_INVALID_UTF16_SURROGATE = 65;
@@ -708,15 +663,6 @@
"\u672a\u627e\u5230\u51fd\u6570\u6807\u8bb0\u3002"},
- /** Argument 'localName' is null */
- //public static final int ER_ARG_LOCALNAME_NULL = 70;
-
-
- {
- ER_ARG_LOCALNAME_NULL,
- "\u53d8\u91cf 'localName' \u4e3a\u7a7a"},
-
-
/** Can not deal with XPath type: */
//public static final int ER_CANNOT_DEAL_XPATH_TYPE = 71;
@@ -1009,32 +955,6 @@
{
ER_EXPECTED_REL_PATH_PATTERN,
"\u9700\u8981\u76f8\u5bf9\u8def\u5f84\u6a21\u5f0f\u3002"},
-
-
- // Note to translators: A QNAME has the syntactic form [NCName:]NCName
- // The localname is the portion after the optional colon; the message
indicates
- // that there is a problem with that part of the QNAME.
-
- /** localname in QNAME should be a valid NCName */
- //public static final int ER_ARG_LOCALNAME_INVALID = 101;
-
-
- {
- ER_ARG_LOCALNAME_INVALID,
- "QNAME \u4e2d\u7684 Localname
\u5e94\u8be5\u662f\u4e00\u4e2a\u6709\u6548\u7684 NCName"},
-
-
- // Note to translators: A QNAME has the syntactic form [NCName:]NCName
- // The prefix is the portion before the optional colon; the message
indicates
- // that there is a problem with that part of the QNAME.
-
- /** prefix in QNAME should be a valid NCName */
- //public static final int ER_ARG_PREFIX_INVALID = 102;
-
-
- {
- ER_ARG_PREFIX_INVALID,
- "QNAME
\u4e2d\u7684\u524d\u7f00\u5e94\u8be5\u662f\u4e00\u4e2a\u6709\u6548\u7684
NCName"},
// Note to translators: The substitution text is the name of a data type.
The
1.3 +1 -81
xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_zh_TW.java
Index: XPATHErrorResources_zh_TW.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_zh_TW.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XPATHErrorResources_zh_TW.java 10 Jan 2003 02:02:04 -0000 1.2
+++ XPATHErrorResources_zh_TW.java 22 Jan 2003 16:27:23 -0000 1.3
@@ -80,7 +80,7 @@
/** Field MAX_CODE */
- public static final int MAX_CODE = 116; // this is needed to keep track
of the number of messages
+ public static final int MAX_CODE = 108; // this is needed to keep track
of the number of messages
/** Field MAX_WARNING */
public static final int MAX_WARNING = 11; // this is needed to keep track
of the number of warnings
@@ -568,33 +568,6 @@
"\u5728 XPathContext
\u4e2d\u4e0d\u652f\u63f4\u5256\u6790\uff08InputSource
\u4f86\u6e90\uff09\uff01\u7121\u6cd5\u958b\u555f {0}"},
- /** Field ER_CREATEDOCUMENT_NOT_SUPPORTED */
- //public static final int ER_CREATEDOCUMENT_NOT_SUPPORTED = 54;
-
-
- {
- ER_CREATEDOCUMENT_NOT_SUPPORTED,
- "createDocument() \u5728 XPathContext
\u4e2d\u4e0d\u53d7\u652f\u63f4\uff01"},
-
-
- /** Field ER_CHILD_HAS_NO_OWNER_DOCUMENT */
- //public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT = 55;
-
-
- {
- ER_CHILD_HAS_NO_OWNER_DOCUMENT,
-
"\u5c6c\u6027\u5b50\u9805\u6c92\u6709\u64c1\u6709\u8005\u6587\u4ef6\uff01"},
-
-
- /** Field ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT */
- //public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT = 56;
-
-
- {
- ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT,
-
"\u5c6c\u6027\u5b50\u9805\u6c92\u6709\u64c1\u6709\u8005\u6587\u4ef6\u5143\u7d20\uff01"},
-
-
/** Field ER_SAX_API_NOT_HANDLED */
//public static final int ER_SAX_API_NOT_HANDLED = 57;
@@ -648,24 +621,6 @@
ER_XERCES_PARSE_ERROR, "DOM2Helper.parse \u932f\u8aa4"},
- /** Field ER_CANT_OUTPUT_TEXT_BEFORE_DOC */
- //public static final int ER_CANT_OUTPUT_TEXT_BEFORE_DOC = 63;
-
-
- {
- ER_CANT_OUTPUT_TEXT_BEFORE_DOC,
-
"\u8b66\u544a\uff1a\u7121\u6cd5\u8f38\u51fa\u6587\u4ef6\u5143\u7d20\u4e4b\u524d\u7684\u6587\u5b57\uff01\u5ffd\u7565..."},
-
-
- /** Field ER_CANT_HAVE_MORE_THAN_ONE_ROOT */
- //public static final int ER_CANT_HAVE_MORE_THAN_ONE_ROOT = 64;
-
-
- {
- ER_CANT_HAVE_MORE_THAN_ONE_ROOT,
- "\u4e00\u500b DOM \u53ea\u80fd\u6709\u4e00\u500b\u6839\uff01"},
-
-
/** Field ER_INVALID_UTF16_SURROGATE */
//public static final int ER_INVALID_UTF16_SURROGATE = 65;
@@ -708,15 +663,6 @@
"\u627e\u4e0d\u5230\u51fd\u5f0f\u8a18\u865f\u3002"},
- /** Argument 'localName' is null */
- //public static final int ER_ARG_LOCALNAME_NULL = 70;
-
-
- {
- ER_ARG_LOCALNAME_NULL,
- "\u5f15\u6578 'localName' \u70ba\u7a7a\u503c"},
-
-
/** Can not deal with XPath type: */
//public static final int ER_CANNOT_DEAL_XPATH_TYPE = 71;
@@ -1010,32 +956,6 @@
{
ER_EXPECTED_REL_PATH_PATTERN,
"\u61c9\u70ba\u76f8\u5c0d\u8def\u5f91\u578b\u6a23\u3002"},
-
-
- // Note to translators: A QNAME has the syntactic form [NCName:]NCName
- // The localname is the portion after the optional colon; the message
indicates
- // that there is a problem with that part of the QNAME.
-
- /** localname in QNAME should be a valid NCName */
- //public static final int ER_ARG_LOCALNAME_INVALID = 101;
-
-
- {
- ER_ARG_LOCALNAME_INVALID,
- "QNAME \u4e2d\u7684 Localname \u61c9\u70ba\u6709\u6548\u7684 NCName"},
-
-
- // Note to translators: A QNAME has the syntactic form [NCName:]NCName
- // The prefix is the portion before the optional colon; the message
indicates
- // that there is a problem with that part of the QNAME.
-
- /** prefix in QNAME should be a valid NCName */
- //public static final int ER_ARG_PREFIX_INVALID = 102;
-
-
- {
- ER_ARG_PREFIX_INVALID,
- "QNAME \u4e2d\u7684\u524d\u7f6e\u61c9\u70ba\u6709\u6548\u7684
NCName"},
// Note to translators: The substitution text is the name of a data
type. The
1.1
xml-xalan/java/src/org/apache/xpath/res/XPATHMessages.java
Index: XPATHMessages.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Xalan" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation and was
* originally based on software copyright (c) 1999, Lotus
* Development Corporation., http://www.lotus.com. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.xpath.res;
import java.util.Locale;
import java.util.ResourceBundle;
import java.util.ListResourceBundle;
import java.util.MissingResourceException;
import org.apache.xml.res.XMLMessages;
/**
* <meta name="usage" content="internal"/>
* A utility class for issuing XPath error messages.
*/
public class XPATHMessages extends XMLMessages
{
/** The language specific resource object for XPath messages. */
private static ListResourceBundle XPATHBundle = null;
/** The class name of the XPath error message string table. */
private static final String XPATH_ERROR_RESOURCES =
"org.apache.xpath.res.XPATHErrorResources";
/**
* Creates a message from the specified key and replacement
* arguments, localized to the given locale.
*
* @param errorCode The key for the message text.
* @param args The arguments to be used as replacement text
* in the message created.
*
* @return The formatted message string.
*/
public static final String createXPATHMessage(String msgKey, Object args[])
//throws Exception
{
if (XPATHBundle == null)
XPATHBundle = loadResourceBundle(XPATH_ERROR_RESOURCES);
if (XPATHBundle != null)
{
return createXPATHMsg(XPATHBundle, msgKey, args);
}
else
return "Could not load any resource bundles.";
}
/**
* Creates a message from the specified key and replacement
* arguments, localized to the given locale.
*
* @param msgKey The key for the message text.
* @param args The arguments to be used as replacement text
* in the message created.
*
* @return The formatted warning string.
*/
public static final String createXPATHWarning(String msgKey, Object args[])
//throws Exception
{
if (XPATHBundle == null)
XPATHBundle = loadResourceBundle(XPATH_ERROR_RESOURCES);
if (XPATHBundle != null)
{
return createXPATHMsg(XPATHBundle, msgKey, args);
}
else
return "Could not load any resource bundles.";
}
/**
* Creates a message from the specified key and replacement
* arguments, localized to the given locale.
*
* @param errorCode The key for the message text.
*
* @param fResourceBundle The resource bundle to use.
* @param msgKey The message key to use.
* @param args The arguments to be used as replacement text
* in the message created.
*
* @return The formatted message string.
*/
public static final String createXPATHMsg(ListResourceBundle
fResourceBundle,
String msgKey, Object args[])
//throws Exception
{
String fmsg = null;
boolean throwex = false;
String msg = null;
if (msgKey != null)
msg = fResourceBundle.getString(msgKey);
if (msg == null)
{
msg = fResourceBundle.getString(XPATHErrorResources.BAD_CODE);
throwex = true;
}
if (args != null)
{
try
{
// Do this to keep format from crying.
// This is better than making a bunch of conditional
// code all over the place.
int n = args.length;
for (int i = 0; i < n; i++)
{
if (null == args[i])
args[i] = "";
}
fmsg = java.text.MessageFormat.format(msg, args);
}
catch (Exception e)
{
fmsg = fResourceBundle.getString(XPATHErrorResources.FORMAT_FAILED);
fmsg += " " + msg;
}
}
else
fmsg = msg;
if (throwex)
{
throw new RuntimeException(fmsg);
}
return fmsg;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
