diff options
author | asaha <none@none> | 2015-06-17 23:25:31 -0700 |
---|---|---|
committer | asaha <none@none> | 2015-06-17 23:25:31 -0700 |
commit | 39674a4d934c8349df359d78a5529cf195de35a3 (patch) | |
tree | bbf57c549c9896750b014a2b1de41912492cfe62 /src | |
parent | fbd4851adec098b03e7da7d3559f4d36852628a9 (diff) | |
parent | fef13ac4aaf504c6773295b29669ff01cc6f19c7 (diff) | |
download | jdk8u_jaxp-39674a4d934c8349df359d78a5529cf195de35a3.tar.gz |
Merge
Diffstat (limited to 'src')
10 files changed, 21 insertions, 15 deletions
diff --git a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java index fb9410a..183697b 100644 --- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java +++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java @@ -1283,10 +1283,10 @@ public class XSLTErrorResources_sv extends ListResourceBundle "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."}, diff --git a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java index 0bbc6b6..0920f44 100644 --- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java @@ -369,7 +369,7 @@ public class ErrorMessages_sv extends ListResourceBundle { * 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 diff --git a/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java b/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java index df9620a..4624205 100644 --- a/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java +++ b/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java @@ -529,6 +529,16 @@ public class UTF8Reader 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) { diff --git a/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties b/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties index 064c0ce..f7634f2 100644 --- a/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties @@ -16,8 +16,8 @@ schema-already-specified = Egenskapen ''{0}'' kan inte anges om ett Schema-objek # 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. diff --git a/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties index 9be2a87..d35c17d 100644 --- a/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties @@ -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. diff --git a/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java b/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java index d9ca5b0..5fdf653 100644 --- a/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java +++ b/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java @@ -2116,7 +2116,7 @@ public class DTMNodeProxy */ @Override public String getTextContent() throws DOMException { - return getNodeValue(); // overriden in some subclasses + return dtm.getStringValue(node).toString(); } /** diff --git a/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java b/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java index ea0e9b7..526f5e1 100644 --- a/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java +++ b/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java @@ -3145,11 +3145,7 @@ public class SAX2DTM2 extends SAX2DTM 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; diff --git a/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java index 25301ca..2f27ddb 100644 --- a/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java +++ b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java @@ -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. diff --git a/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java index 0ded63a..94ea0da 100644 --- a/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java +++ b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java @@ -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. diff --git a/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java index dbd0e82..b1e4a8a 100644 --- a/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java +++ b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java @@ -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. |