Mercurial > hg > openjdk > aarch64-port > jaxp
changeset 1071:b1a98c60e651
Merge
author | asaha |
---|---|
date | Wed, 17 Jun 2015 21:54:23 -0700 |
parents | a120f9ccdaa0 (current diff) def8014e4970 (diff) |
children | 69b8d41827c9 |
files | .hgtags src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java |
diffstat | 11 files changed, 22 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Jun 10 23:14:54 2015 -0700 +++ b/.hgtags Wed Jun 17 21:54:23 2015 -0700 @@ -440,3 +440,4 @@ e882f38df713cac5cec98e18a013a81ce9fad0d3 jdk8u60-b17 ee389d2cb785317ae0b8bb2c73e72daf9435824d jdk8u60-b18 a86893381fbb1c03ee743b691a7b7d6a90903eca jdk8u60-b19 +7d03050620d74e6e6b60c9e64b5b8cbe557c8201 jdk8u60-b20
--- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Wed Jun 10 23:14:54 2015 -0700 +++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Wed Jun 17 21:54:23 2015 -0700 @@ -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."},
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java Wed Jun 10 23:14:54 2015 -0700 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java Wed Jun 17 21:54:23 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
--- a/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java Wed Jun 10 23:14:54 2015 -0700 +++ b/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java Wed Jun 17 21:54:23 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 23:14:54 2015 -0700 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties Wed Jun 17 21:54:23 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/XMLSerializerMessages_sv.properties Wed Jun 10 23:14:54 2015 -0700 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties Wed Jun 17 21:54:23 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 23:14:54 2015 -0700 +++ b/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Wed Jun 17 21:54:23 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 23:14:54 2015 -0700 +++ b/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Wed Jun 17 21:54:23 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/xpath/internal/res/XPATHErrorResources_it.java Wed Jun 10 23:14:54 2015 -0700 +++ b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java Wed Jun 17 21:54:23 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 23:14:54 2015 -0700 +++ b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java Wed Jun 17 21:54:23 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_zh_TW.java Wed Jun 10 23:14:54 2015 -0700 +++ b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java Wed Jun 17 21:54:23 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.