Mercurial > hg > openjdk > aarch64-port > jaxp
changeset 1006:59110fece6ef
Merge up to jdk8u60-b21
line wrap: on
line diff
--- a/.hgtags Thu Apr 16 11:36:35 2015 +0100 +++ b/.hgtags Tue Jun 30 16:17:15 2015 +0100 @@ -414,3 +414,25 @@ d4042340fe0aa9d33a161890e179bc21b6c7b8e6 jdk8u45-b11 91d1102264e9b58b2ada4b5f112d472f0d86092b jdk8u45-b12 a15025742f201f05ead3d731780a4ad437524491 jdk8u45-b13 +e0167ec9d7596ab9ac52a8c3b85c1aef5d3fbd92 jdk8u45-b14 +3b73732d6886dc8155f0c1fbb125ca60d9e2fd2b jdk8u60-b00 +b0e15cd169a93080c4e30e9eb3061d0b329bf38c jdk8u60-b01 +0b64e727bdb06c82caa02ef25ac2552ce3314537 jdk8u60-b02 +0c3f4e5092d20ed76754fdb3002bebb46952375e jdk8u60-b03 +bd05a145e589b5bc200898a34d2d0f78372e9ed0 jdk8u60-b04 +13a5799e90e958eea7c72bc93829d709a1053995 jdk8u60-b05 +b265b39444379ccd9d4038a8f10c0527f12ba06f jdk8u60-b06 +51eab6899806b399bcca4533ab01362a306e4d0b jdk8u60-b07 +0ef3e20f1d48ddf8b1845039f97dc1174d0701ad jdk8u60-b08 +566ff4ee50bbfbb9f414289b8206be077f07294e jdk8u60-b09 +497d106d476db2eaa0e0ca2756e211fdf9f0d34e jdk8u60-b10 +c8c6e549d1a6e454aa9fd5965a966f5e3a870e60 jdk8u60-b11 +412597b17df8a4109b4fcf32687785c2c93ac536 jdk8u60-b12 +c61fbe5729d4d6ce5522f357b95f285bada8b440 jdk8u60-b13 +ddb4bf8a306a8b0d94ca639994b2b420632d40b3 jdk8u60-b14 +040ce4bf5a41047116a0be643d791b9c76c412b3 jdk8u60-b15 +3cb841defba069c891f80fb03e2c71dad995ae6a jdk8u60-b16 +e882f38df713cac5cec98e18a013a81ce9fad0d3 jdk8u60-b17 +ee389d2cb785317ae0b8bb2c73e72daf9435824d jdk8u60-b18 +a86893381fbb1c03ee743b691a7b7d6a90903eca jdk8u60-b19 +7d03050620d74e6e6b60c9e64b5b8cbe557c8201 jdk8u60-b20
--- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Tue Jun 30 16:17:15 2015 +0100 @@ -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 Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java Tue Jun 30 16:17:15 2015 +0100 @@ -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 Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java Tue Jun 30 16:17:15 2015 +0100 @@ -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 Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java Tue Jun 30 16:17:15 2015 +0100 @@ -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 Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java Tue Jun 30 16:17:15 2015 +0100 @@ -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 Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java Tue Jun 30 16:17:15 2015 +0100 @@ -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 Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java Tue Jun 30 16:17:15 2015 +0100 @@ -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 Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java Tue Jun 30 16:17:15 2015 +0100 @@ -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 Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java Tue Jun 30 16:17:15 2015 +0100 @@ -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 Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java Tue Jun 30 16:17:15 2015 +0100 @@ -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 Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java Tue Jun 30 16:17:15 2015 +0100 @@ -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/xalan/internal/xsltc/dom/MultiDOM.java Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java Tue Jun 30 16:17:15 2015 +0100 @@ -567,8 +567,12 @@ } public NodeList makeNodeList(DTMAxisIterator iter) { - // TODO: gather nodes from all DOMs ? - return _main.makeNodeList(iter); + int index = iter.next(); + if (index == DTM.NULL) { + return null; + } + iter.reset(); + return _adapters[getDTMId(index)].makeNodeList(iter); } public String getLanguage(int node) {
--- a/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Tue Jun 30 16:17:15 2015 +0100 @@ -270,7 +270,7 @@ if (Double.isNaN(start)) return(EMPTYSTRING); - final int strlen = value.length(); + final int strlen = getStringLength(value); int istart = (int)Math.round(start) - 1; if (istart > strlen) @@ -278,6 +278,7 @@ if (istart < 1) istart = 0; try { + istart = value.offsetByCodePoints(0, istart); return value.substring(istart); } catch (IndexOutOfBoundsException e) { runTimeError(RUN_TIME_INTERNAL_ERR, "substring()"); @@ -297,24 +298,30 @@ return(EMPTYSTRING); int istart = (int)Math.round(start) - 1; + int ilength = (int)Math.round(length); final int isum; if (Double.isInfinite(length)) isum = Integer.MAX_VALUE; else - isum = istart + (int)Math.round(length); + isum = istart + ilength; - final int strlen = value.length(); + final int strlen = getStringLength(value); if (isum < 0 || istart > strlen) return(EMPTYSTRING); - if (istart < 0) + if (istart < 0) { + ilength += istart; istart = 0; + } try { - if (isum > strlen) + istart = value.offsetByCodePoints(0, istart); + if (isum > strlen) { return value.substring(istart); - else - return value.substring(istart, isum); + } else { + int offset = value.offsetByCodePoints(istart, ilength); + return value.substring(istart, offset); + } } catch (IndexOutOfBoundsException e) { runTimeError(RUN_TIME_INTERNAL_ERR, "substring()"); return null;
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java Tue Jun 30 16:17:15 2015 +0100 @@ -1418,7 +1418,7 @@ // AttValue boolean isVC = !fStandalone && (fSeenExternalDTD || fSeenExternalPE) ; scanAttributeValue(defaultVal, nonNormalizedDefaultVal, atName, - fAttributes, 0, isVC); + fAttributes, 0, isVC, elName); } return defaultType;
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Tue Jun 30 16:17:15 2015 +0100 @@ -1546,7 +1546,7 @@ scanAttributeValue(tmpStr, fTempString2, fAttributeQName.rawname, attributes, - attIndex, isVC); + attIndex, isVC, fCurrentElement.rawname); // content int oldLen = attributes.getLength();
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java Tue Jun 30 16:17:15 2015 +0100 @@ -438,7 +438,7 @@ XMLString tmpStr = getString(); scanAttributeValue(tmpStr, fTempString2, fAttributeQName.rawname, attributes, - attrIndex, isVC); + attrIndex, isVC, fCurrentElement.rawname); String value = null; //fTempString.toString();
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java Tue Jun 30 16:17:15 2015 +0100 @@ -812,6 +812,7 @@ * @param attrIndex The index of the attribute to use from the list. * @param checkEntities true if undeclared entities should be reported as VC violation, * false if undeclared entities should be reported as WFC violation. + * @param eleName The name of element to which this attribute belongs. * * <strong>Note:</strong> This method uses fStringBuffer2, anything in it * at the time of calling is lost. @@ -820,13 +821,13 @@ XMLString nonNormalizedValue, String atName, XMLAttributes attributes, int attrIndex, - boolean checkEntities) + boolean checkEntities, String eleName) throws IOException, XNIException { XMLStringBuffer stringBuffer = null; // quote int quote = fEntityScanner.peekChar(); if (quote != '\'' && quote != '"') { - reportFatalError("OpenQuoteExpected", new Object[]{atName}); + reportFatalError("OpenQuoteExpected", new Object[]{eleName, atName}); } fEntityScanner.scanChar(); @@ -952,7 +953,7 @@ } } else if (c == '<') { reportFatalError("LessthanInAttValue", - new Object[] { null, atName }); + new Object[] { eleName, atName }); fEntityScanner.scanChar(); if (entityDepth == fEntityDepth && fNeedNonNormalizedValue) { fStringBuffer2.append((char)c); @@ -987,7 +988,7 @@ } } else if (c != -1 && isInvalidLiteral(c)) { reportFatalError("InvalidCharInAttValue", - new Object[] {Integer.toString(c, 16)}); + new Object[] {eleName, atName, Integer.toString(c, 16)}); fEntityScanner.scanChar(); if (entityDepth == fEntityDepth && fNeedNonNormalizedValue) { fStringBuffer2.append((char)c); @@ -1016,7 +1017,7 @@ // quote int cquote = fEntityScanner.scanChar(); if (cquote != quote) { - reportFatalError("CloseQuoteExpected", new Object[]{atName}); + reportFatalError("CloseQuoteExpected", new Object[]{eleName, atName}); } } // scanAttributeValue()
--- a/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java Tue Jun 30 16:17:15 2015 +0100 @@ -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 Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties Tue Jun 30 16:17:15 2015 +0100 @@ -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 Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties Tue Jun 30 16:17:15 2015 +0100 @@ -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 Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties Tue Jun 30 16:17:15 2015 +0100 @@ -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/xerces/internal/utils/XMLLimitAnalyzer.java Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java Tue Jun 30 16:17:15 2015 +0100 @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development
--- a/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java Tue Jun 30 16:17:15 2015 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it
--- a/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java Tue Jun 30 16:17:15 2015 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it
--- a/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Tue Jun 30 16:17:15 2015 +0100 @@ -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 Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Tue Jun 30 16:17:15 2015 +0100 @@ -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 Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java Tue Jun 30 16:17:15 2015 +0100 @@ -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 Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java Tue Jun 30 16:17:15 2015 +0100 @@ -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 Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java Tue Jun 30 16:17:15 2015 +0100 @@ -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 Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java Tue Jun 30 16:17:15 2015 +0100 @@ -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 Thu Apr 16 11:36:35 2015 +0100 +++ b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java Tue Jun 30 16:17:15 2015 +0100 @@ -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.