Mercurial > jdk8-mips64-public > jaxp / changeset
changeset
Merge
Wed, 17 Jun 2015 23:25:31 -0700
- author
- asaha
- date
- Wed, 17 Jun 2015 23:25:31 -0700
- changeset 1097
- bd0b41c3c7d4
- parent 1096
- 2176ff6881a6
- parent 1042
- b1a98c60e651
- child 1098
- ebdac13566c5
- child 1099
- c5bfc64c7f95
Merge
| .hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Mon Jun 15 11:39:32 2015 -0700 1.2 +++ b/.hgtags Wed Jun 17 23:25:31 2015 -0700 1.3 @@ -444,6 +444,7 @@ 1.4 e882f38df713cac5cec98e18a013a81ce9fad0d3 jdk8u60-b17 1.5 ee389d2cb785317ae0b8bb2c73e72daf9435824d jdk8u60-b18 1.6 a86893381fbb1c03ee743b691a7b7d6a90903eca jdk8u60-b19 1.7 +7d03050620d74e6e6b60c9e64b5b8cbe557c8201 jdk8u60-b20 1.8 d6ef96871920e6f6a0c437850c5afb6d7fc5b4f8 jdk8u52-b06 1.9 aa8bfb1b3e83bdda687d6c065bb51174d8cc5a81 jdk8u52-b07 1.10 d6ef96871920e6f6a0c437850c5afb6d7fc5b4f8 jdk8u65-b00
2.1 --- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Mon Jun 15 11:39:32 2015 -0700 2.2 +++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Wed Jun 17 23:25:31 2015 -0700 2.3 @@ -1283,10 +1283,10 @@ 2.4 "xsl:stylesheet kr\u00E4ver ett 'version'-attribut!"}, 2.5 2.6 { WG_ILLEGAL_ATTRIBUTE_NAME, 2.7 - "Ogiltigt attributnamn: {0}"}, 2.8 + "Otill\u00E5tet attributnamn: {0}"}, 2.9 2.10 { WG_ILLEGAL_ATTRIBUTE_VALUE, 2.11 - "Ogiltigt v\u00E4rde anv\u00E4nds f\u00F6r attributet {0}: {1}"}, 2.12 + "Otill\u00E5tet v\u00E4rde anv\u00E4nds f\u00F6r attributet {0}: {1}"}, 2.13 2.14 { WG_EMPTY_SECOND_ARG, 2.15 "Resulterande nodupps\u00E4ttning fr\u00E5n dokumentfunktionens andra argumentet \u00E4r tomt. En tom nodupps\u00E4ttning anv\u00E4nds."},
3.1 --- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java Mon Jun 15 11:39:32 2015 -0700 3.2 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java Wed Jun 17 23:25:31 2015 -0700 3.3 @@ -369,7 +369,7 @@ 3.4 * element of a type that it was not permitted to contain. 3.5 */ 3.6 {ErrorMsg.ILLEGAL_CHILD_ERR, 3.7 - "Ogiltigt underordnat element."}, 3.8 + "Otill\u00E5tet underordnat element."}, 3.9 3.10 /* 3.11 * Note to translators: The stylesheet tried to create an element with
4.1 --- a/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java Mon Jun 15 11:39:32 2015 -0700 4.2 +++ b/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java Wed Jun 17 23:25:31 2015 -0700 4.3 @@ -529,6 +529,16 @@ 4.4 invalidByte(4, 4, b2); 4.5 } 4.6 4.7 + // check if output buffer is large enough to hold 2 surrogate chars 4.8 + if (out + 1 >= ch.length) { 4.9 + fBuffer[0] = (byte)b0; 4.10 + fBuffer[1] = (byte)b1; 4.11 + fBuffer[2] = (byte)b2; 4.12 + fBuffer[3] = (byte)b3; 4.13 + fOffset = 4; 4.14 + return out - offset; 4.15 + } 4.16 + 4.17 // decode bytes into surrogate characters 4.18 int uuuuu = ((b0 << 2) & 0x001C) | ((b1 >> 4) & 0x0003); 4.19 if (uuuuu > 0x10) {
5.1 --- a/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties Mon Jun 15 11:39:32 2015 -0700 5.2 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties Wed Jun 17 23:25:31 2015 -0700 5.3 @@ -16,8 +16,8 @@ 5.4 # feature messages 5.5 feature-not-supported = Funktionen ''{0}'' st\u00F6ds inte. 5.6 feature-not-recognized = Funktionen ''{0}'' \u00E4r ok\u00E4nd. 5.7 -true-not-supported = True-status f\u00F6r funktionen ''{0}'' st\u00F6ds inte. 5.8 -false-not-supported = False-status f\u00F6r funktionen ''{0}'' st\u00F6ds inte. 5.9 +true-not-supported = True-tillst\u00E5nd f\u00F6r funktionen ''{0}'' st\u00F6ds inte. 5.10 +false-not-supported = False-tillst\u00E5nd f\u00F6r funktionen ''{0}'' st\u00F6ds inte. 5.11 feature-read-only = Funktionen ''{0}'' \u00E4r skrivskyddad. 5.12 jaxp-secureprocessing-feature = FEATURE_SECURE_PROCESSING: Funktionen kan inte anges till false om s\u00E4kerhetshanteraren anv\u00E4nds. 5.13
6.1 --- a/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties Mon Jun 15 11:39:32 2015 -0700 6.2 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties Wed Jun 17 23:25:31 2015 -0700 6.3 @@ -13,7 +13,7 @@ 6.4 NoWriterSupplied = Det finns ingen skrivare f\u00F6r serializer. 6.5 MethodNotSupported = Metoden ''{0}'' st\u00F6ds inte i denna fabriksinst\u00E4llning. 6.6 ResetInMiddle = Serializer kan inte \u00E5terst\u00E4llas under p\u00E5g\u00E5ende serialisering. 6.7 - Internal = Internt fel: elementstatus \u00E4r noll. 6.8 + Internal = Internt fel: elementtillst\u00E5nd \u00E4r noll. 6.9 NoName = Det finns inget rawName och localName \u00E4r null. 6.10 ElementQName = Elementnamnet ''{0}'' \u00E4r inte n\u00E5got QName. 6.11 ElementPrefix = Elementet ''{0}'' tillh\u00F6r inte n\u00E5gon namnrymd: prefixet kanske inte har deklarerats eller \u00E4r bundet till annan namnrymd.
7.1 --- a/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Mon Jun 15 11:39:32 2015 -0700 7.2 +++ b/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Wed Jun 17 23:25:31 2015 -0700 7.3 @@ -2116,7 +2116,7 @@ 7.4 */ 7.5 @Override 7.6 public String getTextContent() throws DOMException { 7.7 - return getNodeValue(); // overriden in some subclasses 7.8 + return dtm.getStringValue(node).toString(); 7.9 } 7.10 7.11 /**
8.1 --- a/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Mon Jun 15 11:39:32 2015 -0700 8.2 +++ b/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Wed Jun 17 23:25:31 2015 -0700 8.3 @@ -3145,11 +3145,7 @@ 8.4 m_data.elementAt(-dataIndex+1)); 8.5 } 8.6 } 8.7 - else if (DTM.ELEMENT_NODE == type) 8.8 - { 8.9 - return getStringValueX(nodeHandle); 8.10 - } 8.11 - else if (DTM.DOCUMENT_FRAGMENT_NODE == type 8.12 + else if (DTM.ELEMENT_NODE == type || DTM.DOCUMENT_FRAGMENT_NODE == type 8.13 || DTM.DOCUMENT_NODE == type) 8.14 { 8.15 return null;
9.1 --- a/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java Mon Jun 15 11:39:32 2015 -0700 9.2 +++ b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java Wed Jun 17 23:25:31 2015 -0700 9.3 @@ -3,7 +3,7 @@ 9.4 * DO NOT REMOVE OR ALTER! 9.5 */ 9.6 /* 9.7 - * Copyright 1999-2004 The Apache Software Foundation. 9.8 + * Copyright 1999-2005 The Apache Software Foundation. 9.9 * 9.10 * Licensed under the Apache License, Version 2.0 (the "License"); 9.11 * you may not use this file except in compliance with the License.
10.1 --- a/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java Mon Jun 15 11:39:32 2015 -0700 10.2 +++ b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java Wed Jun 17 23:25:31 2015 -0700 10.3 @@ -3,7 +3,7 @@ 10.4 * DO NOT REMOVE OR ALTER! 10.5 */ 10.6 /* 10.7 - * Copyright 1999-2004 The Apache Software Foundation. 10.8 + * Copyright 1999-2005 The Apache Software Foundation. 10.9 * 10.10 * Licensed under the Apache License, Version 2.0 (the "License"); 10.11 * you may not use this file except in compliance with the License.
11.1 --- a/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java Mon Jun 15 11:39:32 2015 -0700 11.2 +++ b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java Wed Jun 17 23:25:31 2015 -0700 11.3 @@ -3,7 +3,7 @@ 11.4 * DO NOT REMOVE OR ALTER! 11.5 */ 11.6 /* 11.7 - * Copyright 1999-2004 The Apache Software Foundation. 11.8 + * Copyright 1999-2005 The Apache Software Foundation. 11.9 * 11.10 * Licensed under the Apache License, Version 2.0 (the "License"); 11.11 * you may not use this file except in compliance with the License.
