Mercurial > hg > openjdk > aarch64-port > jaxp
changeset 1004:7d03050620d7 jdk8u60-b20
Merge
author | lana |
---|---|
date | Fri, 12 Jun 2015 18:45:48 -0700 |
parents | b431579e40d1 (current diff) a00b66a274f2 (diff) |
children | def8014e4970 487b21426179 0aedac03c20b |
files | |
diffstat | 22 files changed, 62 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Fri Jun 12 18:45:48 2015 -0700 @@ -1223,10 +1223,10 @@ "Gammal syntax: Namnet p\u00E5 'expr'-attributet har \u00E4ndrats till 'select'."}, { WG_NO_LOCALE_IN_FORMATNUMBER, - "Xalan hanterar \u00E4nnu inte spr\u00E5knamnet i funktionen format-number."}, + "Xalan hanterar \u00E4nnu inte spr\u00E5kkonventionen i funktionen format-number."}, { WG_LOCALE_NOT_FOUND, - "Varning: Hittade inte spr\u00E5kinst\u00E4llning f\u00F6r xml:lang={0}"}, + "Varning: Hittade inte spr\u00E5kkonvention f\u00F6r xml:lang={0}"}, { WG_CANNOT_MAKE_URL_FROM, "Kan inte skapa URL fr\u00E5n: {0}"}, @@ -1283,10 +1283,10 @@ "xsl:stylesheet kr\u00E4ver ett 'version'-attribut!"}, { WG_ILLEGAL_ATTRIBUTE_NAME, - "Ogiltigt attributnamn: {0}"}, + "Otill\u00E5tet attributnamn: {0}"}, { WG_ILLEGAL_ATTRIBUTE_VALUE, - "Ogiltigt v\u00E4rde anv\u00E4nds f\u00F6r attributet {0}: {1}"}, + "Otill\u00E5tet v\u00E4rde anv\u00E4nds f\u00F6r attributet {0}: {1}"}, { WG_EMPTY_SECOND_ARG, "Resulterande nodupps\u00E4ttning fr\u00E5n dokumentfunktionens andra argumentet \u00E4r tomt. En tom nodupps\u00E4ttning anv\u00E4nds."}, @@ -1326,8 +1326,8 @@ { "version", ">>>>>>> Xalan version "}, { "version2", "<<<<<<<"}, { "yes", "ja"}, - { "line", "Rad #"}, - { "column","Kolumn #"}, + { "line", "Rad nr"}, + { "column","Kolumn nr"}, { "xsldone", "XSLProcessor: utf\u00F6rd"},
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java Fri Jun 12 18:45:48 2015 -0700 @@ -597,6 +597,9 @@ {ErrorMsg.JAXP_INVALID_ATTR_ERR, "TransformerFactory erkennt Attribut \"{0}\" nicht."}, + {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, + "Falscher Wert f\u00FCr Attribut ''{0}'' angegeben."}, + /* * Note to translators: "setResult()" and "startDocument()" are Java * method names that should not be translated.
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java Fri Jun 12 18:45:48 2015 -0700 @@ -597,6 +597,9 @@ {ErrorMsg.JAXP_INVALID_ATTR_ERR, "TransformerFactory no reconoce el atributo ''{0}''."}, + {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, + "Valor no v\u00E1lido especificado para el atributo ''{0}''."}, + /* * Note to translators: "setResult()" and "startDocument()" are Java * method names that should not be translated.
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java Fri Jun 12 18:45:48 2015 -0700 @@ -597,6 +597,9 @@ {ErrorMsg.JAXP_INVALID_ATTR_ERR, "TransformerFactory ne reconna\u00EEt pas l''attribut ''{0}''."}, + {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, + "La valeur indiqu\u00E9e pour l''attribut ''{0}'' est incorrecte."}, + /* * Note to translators: "setResult()" and "startDocument()" are Java * method names that should not be translated.
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java Fri Jun 12 18:45:48 2015 -0700 @@ -597,6 +597,9 @@ {ErrorMsg.JAXP_INVALID_ATTR_ERR, "TransformerFactory non riconosce l''attributo ''{0}''."}, + {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, + "Valore errato specificato per l''attributo ''{0}''."}, + /* * Note to translators: "setResult()" and "startDocument()" are Java * method names that should not be translated.
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java Fri Jun 12 18:45:48 2015 -0700 @@ -597,6 +597,9 @@ {ErrorMsg.JAXP_INVALID_ATTR_ERR, "TransformerFactory\u306F\u5C5E\u6027''{0}''\u3092\u8A8D\u8B58\u3057\u307E\u305B\u3093\u3002"}, + {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, + "''{0}''\u5C5E\u6027\u306B\u6307\u5B9A\u3055\u308C\u305F\u5024\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093\u3002"}, + /* * Note to translators: "setResult()" and "startDocument()" are Java * method names that should not be translated.
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java Fri Jun 12 18:45:48 2015 -0700 @@ -597,6 +597,9 @@ {ErrorMsg.JAXP_INVALID_ATTR_ERR, "TransformerFactory\uC5D0\uC11C ''{0}'' \uC18D\uC131\uC744 \uC778\uC2DD\uD558\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4."}, + {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, + "''{0}'' \uC18D\uC131\uC5D0 \uB300\uD574 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC740 \uAC12\uC774 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4."}, + /* * Note to translators: "setResult()" and "startDocument()" are Java * method names that should not be translated.
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java Fri Jun 12 18:45:48 2015 -0700 @@ -597,6 +597,9 @@ {ErrorMsg.JAXP_INVALID_ATTR_ERR, "TransformerFactory n\u00E3o reconhece o atributo ''{0}''."}, + {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, + "Valor incorreto especificado para o atributo ''{0}''."}, + /* * Note to translators: "setResult()" and "startDocument()" are Java * method names that should not be translated.
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java Fri Jun 12 18:45:48 2015 -0700 @@ -369,7 +369,7 @@ * element of a type that it was not permitted to contain. */ {ErrorMsg.ILLEGAL_CHILD_ERR, - "Ogiltigt underordnat element."}, + "Otill\u00E5tet underordnat element."}, /* * Note to translators: The stylesheet tried to create an element with @@ -597,6 +597,9 @@ {ErrorMsg.JAXP_INVALID_ATTR_ERR, "TransformerFactory k\u00E4nner inte igen attributet ''{0}''."}, + {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, + "Fel v\u00E4rde har angetts f\u00F6r attributet ''{0}''."}, + /* * Note to translators: "setResult()" and "startDocument()" are Java * method names that should not be translated.
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java Fri Jun 12 18:45:48 2015 -0700 @@ -597,6 +597,9 @@ {ErrorMsg.JAXP_INVALID_ATTR_ERR, "TransformerFactory \u65E0\u6CD5\u8BC6\u522B\u5C5E\u6027 ''{0}''\u3002"}, + {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, + "\u4E3A ''{0}'' \u5C5E\u6027\u6307\u5B9A\u7684\u503C\u4E0D\u6B63\u786E\u3002"}, + /* * Note to translators: "setResult()" and "startDocument()" are Java * method names that should not be translated.
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java Fri Jun 12 18:45:48 2015 -0700 @@ -597,6 +597,9 @@ {ErrorMsg.JAXP_INVALID_ATTR_ERR, "TransformerFactory \u7121\u6CD5\u8FA8\u8B58\u5C6C\u6027 ''{0}''\u3002"}, + {ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR, + "\u70BA ''{0}'' \u5C6C\u6027\u6307\u5B9A\u7684\u503C\u4E0D\u6B63\u78BA\u3002"}, + /* * Note to translators: "setResult()" and "startDocument()" are Java * method names that should not be translated.
--- a/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java Fri Jun 12 18:45:48 2015 -0700 @@ -529,6 +529,16 @@ invalidByte(4, 4, b2); } + // check if output buffer is large enough to hold 2 surrogate chars + if (out + 1 >= ch.length) { + fBuffer[0] = (byte)b0; + fBuffer[1] = (byte)b1; + fBuffer[2] = (byte)b2; + fBuffer[3] = (byte)b3; + fOffset = 4; + return out - offset; + } + // decode bytes into surrogate characters int uuuuu = ((b0 << 2) & 0x001C) | ((b1 >> 4) & 0x0003); if (uuuuu > 0x10) {
--- a/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties Fri Jun 12 18:45:48 2015 -0700 @@ -16,8 +16,8 @@ # feature messages feature-not-supported = Funktionen ''{0}'' st\u00F6ds inte. feature-not-recognized = Funktionen ''{0}'' \u00E4r ok\u00E4nd. -true-not-supported = True-status f\u00F6r funktionen ''{0}'' st\u00F6ds inte. -false-not-supported = False-status f\u00F6r funktionen ''{0}'' st\u00F6ds inte. +true-not-supported = True-tillst\u00E5nd f\u00F6r funktionen ''{0}'' st\u00F6ds inte. +false-not-supported = False-tillst\u00E5nd f\u00F6r funktionen ''{0}'' st\u00F6ds inte. feature-read-only = Funktionen ''{0}'' \u00E4r skrivskyddad. jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: Funktionen kan inte anges till false om s\u00E4kerhetshanteraren anv\u00E4nds.
--- a/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties Fri Jun 12 18:45:48 2015 -0700 @@ -121,7 +121,7 @@ InvalidByte = Ogiltig byte {0} i UTF-8-sekvensen f\u00F6r {1}-byte. ExpectedByte = F\u00F6rv\u00E4ntad byte {0} i UTF-8-sekvensen f\u00F6r {1}-byte. InvalidHighSurrogate = H\u00F6ga surrogatbitar i UTF-8-sekvens f\u00E5r inte \u00F6verskrida 0x10, men 0x{0} hittades. - OperationNotSupported = Operation "{0}" st\u00F6ds inte i l\u00E4saren {1}. + OperationNotSupported = \u00C5tg\u00E4rden "{0}" st\u00F6ds inte i l\u00E4saren {1}. InvalidASCII = Byte "{0}" ing\u00E5r inte i ASCII-teckenupps\u00E4ttningen (7 bitar). CharConversionFailure = En enhet som fastst\u00E4lls anv\u00E4nda ett visst kodformat f\u00E5r inte inneh\u00E5lla sekvenser som \u00E4r otill\u00E5tna i kodningen.
--- a/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties Fri Jun 12 18:45:48 2015 -0700 @@ -13,7 +13,7 @@ NoWriterSupplied = Det finns ingen skrivare f\u00F6r serializer. MethodNotSupported = Metoden ''{0}'' st\u00F6ds inte i denna fabriksinst\u00E4llning. ResetInMiddle = Serializer kan inte \u00E5terst\u00E4llas under p\u00E5g\u00E5ende serialisering. - Internal = Internt fel: elementstatus \u00E4r noll. + Internal = Internt fel: elementtillst\u00E5nd \u00E4r noll. NoName = Det finns inget rawName och localName \u00E4r null. ElementQName = Elementnamnet ''{0}'' \u00E4r inte n\u00E5got QName. ElementPrefix = Elementet ''{0}'' tillh\u00F6r inte n\u00E5gon namnrymd: prefixet kanske inte har deklarerats eller \u00E4r bundet till annan namnrymd.
--- a/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Fri Jun 12 18:45:48 2015 -0700 @@ -2116,7 +2116,7 @@ */ @Override public String getTextContent() throws DOMException { - return getNodeValue(); // overriden in some subclasses + return dtm.getStringValue(node).toString(); } /**
--- a/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Fri Jun 12 18:45:48 2015 -0700 @@ -3145,11 +3145,7 @@ m_data.elementAt(-dataIndex+1)); } } - else if (DTM.ELEMENT_NODE == type) - { - return getStringValueX(nodeHandle); - } - else if (DTM.DOCUMENT_FRAGMENT_NODE == type + else if (DTM.ELEMENT_NODE == type || DTM.DOCUMENT_FRAGMENT_NODE == type || DTM.DOCUMENT_NODE == type) { return null;
--- a/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java Fri Jun 12 18:45:48 2015 -0700 @@ -375,8 +375,8 @@ { "BAD_CODE", "Parameter f\u00F6r createMessage ligger utanf\u00F6r gr\u00E4nsv\u00E4rdet"}, { "FORMAT_FAILED", "Undantag utl\u00F6st vid messageFormat-anrop"}, - { "line", "Rad #"}, - { "column","Kolumn #"}, + { "line", "Rad nr"}, + { "column","Kolumn nr"}, {ER_SERIALIZER_NOT_CONTENTHANDLER, "Serializerklassen ''{0}'' implementerar inte org.xml.sax.ContentHandler."},
--- a/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java Fri Jun 12 18:45:48 2015 -0700 @@ -3,7 +3,7 @@ * DO NOT REMOVE OR ALTER! */ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.
--- a/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java Fri Jun 12 18:45:48 2015 -0700 @@ -3,7 +3,7 @@ * DO NOT REMOVE OR ALTER! */ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.
--- a/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java Fri Jun 12 18:45:48 2015 -0700 @@ -480,7 +480,7 @@ "FEL! Hittade inte ENDOP efter OP_LOCATIONPATH"}, { ER_ERROR_OCCURED, - "Fel intr\u00E4ffade!"}, + "Ett fel har intr\u00E4ffat!"}, { ER_ILLEGAL_VARIABLE_REFERENCE, "VariableReference angiven f\u00F6r variabel som \u00E4r utanf\u00F6r kontext eller som saknar definition! Namn = {0}"}, @@ -825,7 +825,7 @@ // Warnings... { WG_LOCALE_NAME_NOT_HANDLED, - "spr\u00E5knamnet i funktionen format-number har \u00E4nnu inte hanterats!"}, + "spr\u00E5kkonventionsnamnet i funktionen format-number har \u00E4nnu inte hanterats!"}, { WG_PROPERTY_NOT_SUPPORTED, "XSL-egenskapen st\u00F6ds inte: {0}"}, @@ -871,8 +871,8 @@ { "version", ">>>>>>> Xalan version "}, { "version2", "<<<<<<<"}, { "yes", "ja"}, - { "line", "Rad #"}, - { "column", "Kolumn #"}, + { "line", "Rad nr"}, + { "column", "Kolumn nr"}, { "xsldone", "XSLProcessor: utf\u00F6rd"}, { "xpath_option", "xpath-alternativ: "}, { "optionIN", " [-in inputXMLURL]"},
--- a/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java Wed Jun 10 18:15:51 2015 -0700 +++ b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java Fri Jun 12 18:45:48 2015 -0700 @@ -3,7 +3,7 @@ * DO NOT REMOVE OR ALTER! */ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.