infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-15 18:33:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

8285097: Duplicate XML keys in XPATHErrorResources.java and XSLTErrorResources.java

Browse Source 
Reviewed-by: joehw, tsteele
This commit is contained in:
Shruthi 2022-05-18 18:13:15 +00:00 committed by Joe Wang
parent 6b9c15211e
commit b5a3d2843b
13 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -31,6 +31,7 @@ import java.util.ListResourceBundle;
* Array. You also need to update MAX_CODE for error strings
* and MAX_WARNING for warnings ( Needed for only information
* purpose )
* @LastModified: May 2022
*/
public class XSLTErrorResources extends ListResourceBundle
{
@ -1333,7 +1334,6 @@ public class XSLTErrorResources extends ListResourceBundle
// for the Xalan Process command line. "Process" is the name of a Java class,
// and should not be translated.
{ "xslProc_option", "Xalan-J command line Process class options:"},
{ "xslProc_option", "Xalan-J command line Process class options\u003a"},
{ "xslProc_invalid_xsltc_option", "The option {0} is not supported in XSLTC mode."},
{ "xslProc_invalid_xalan_option", "The option {0} can only be used with -XSLTC."},
{ "xslProc_no_input", "Error: No stylesheet or input xml is specified. Run this command without any option for usage instructions."},

6
src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -32,7 +32,7 @@ import java.util.List;
/**
* This class makes an select statement act like an result tree fragment.
*
* @LastModified: Oct 2017
* @LastModified: Apr 2022
*/
public class XRTreeFragSelectWrapper extends XRTreeFrag implements Cloneable
{
@ -152,7 +152,7 @@ public class XRTreeFragSelectWrapper extends XRTreeFrag implements Cloneable
*/
public DTMIterator asNodeIterator()
{
throw new RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER, null)); //"asNodeIterator() not supported by XRTreeFragSelectWrapper!");
throw new RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_ASNODEITERATOR_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER, null)); //"asNodeIterator() not supported by XRTreeFragSelectWrapper!");
}
}

9
src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java
View File

@ -31,7 +31,7 @@ import java.util.ListResourceBundle;
* Also you need to update the count of messages(MAX_CODE)or
* the count of warnings(MAX_WARNING) [ Information purpose only]
* @xsl.usage advanced
* @LastModified: Jan 2022
* @LastModified: Apr 2022
*/
public class XPATHErrorResources extends ListResourceBundle
{
@ -595,7 +595,7 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"rtf() not supported by XRTreeFragSelectWrapper"},
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
{ ER_ASNODEITERATOR_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"asNodeIterator() not supported by XRTreeFragSelectWrapper"},
/** detach() not supported by XRTreeFragSelectWrapper */
@ -787,11 +787,6 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
/** Field ER_SOURCE_RETURN_TYPE_CANNOT_BE_NULL */
{ ER_SOURCE_RETURN_TYPE_CANNOT_BE_NULL,
"Source and/or Return Type can not be null"},
/** Field ER_SOURCE_RETURN_TYPE_CANNOT_BE_NULL */
{ ER_SOURCE_RETURN_TYPE_CANNOT_BE_NULL,
"Source and/or Return Type can not be null"},

6
src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -31,7 +31,7 @@ import java.util.ListResourceBundle;
* Also you need to update the count of messages(MAX_CODE)or
* the count of warnings(MAX_WARNING) [ Information purpose only]
* @xsl.usage advanced
* @LastModified: Nov 2021
* @LastModified: May 2022
*/
public class XPATHErrorResources_de extends ListResourceBundle
{
@ -592,7 +592,7 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"rtf() nicht unterst\u00FCtzt von XRTreeFragSelectWrapper"},
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
{ ER_ASNODEITERATOR_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"asNodeIterator() nicht unterst\u00FCtzt von XRTreeFragSelectWrapper"},
/** detach() not supported by XRTreeFragSelectWrapper */

6
src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java
View File

@ -1,6 +1,5 @@
/*
* reserved comment block
* DO NOT REMOVE OR ALTER!
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -32,6 +31,7 @@ import java.util.ListResourceBundle;
* Also you need to update the count of messages(MAX_CODE)or
* the count of warnings(MAX_WARNING) [ Information purpose only]
* @xsl.usage advanced
* @LastModified: May 2022
*/
public class XPATHErrorResources_es extends ListResourceBundle
{
@ -578,7 +578,7 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"rtf() no soportado por XRTreeFragSelectWrapper"},
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
{ ER_ASNODEITERATOR_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"asNodeIterator() no soportado por XRTreeFragSelectWrapper"},
/** detach() not supported by XRTreeFragSelectWrapper */

6
src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java
View File

@ -1,6 +1,5 @@
/*
* reserved comment block
* DO NOT REMOVE OR ALTER!
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -32,6 +31,7 @@ import java.util.ListResourceBundle;
* Also you need to update the count of messages(MAX_CODE)or
* the count of warnings(MAX_WARNING) [ Information purpose only]
* @xsl.usage advanced
* @LastModified: May 2022
*/
public class XPATHErrorResources_fr extends ListResourceBundle
{
@ -578,7 +578,7 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"rtf() non pris en charge par XRTreeFragSelectWrapper"},
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
{ ER_ASNODEITERATOR_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"asNodeIterator() non pris en charge par XRTreeFragSelectWrapper"},
/** detach() not supported by XRTreeFragSelectWrapper */

6
src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java
View File

@ -1,6 +1,5 @@
/*
* reserved comment block
* DO NOT REMOVE OR ALTER!
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -32,6 +31,7 @@ import java.util.ListResourceBundle;
* Also you need to update the count of messages(MAX_CODE)or
* the count of warnings(MAX_WARNING) [ Information purpose only]
* @xsl.usage advanced
* @LastModified: May 2022
*/
public class XPATHErrorResources_it extends ListResourceBundle
{
@ -578,7 +578,7 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"rtf() non supportato da XRTreeFragSelectWrapper"},
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
{ ER_ASNODEITERATOR_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"asNodeIterator() non supportato da XRTreeFragSelectWrapper"},
/** detach() not supported by XRTreeFragSelectWrapper */

6
src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -31,7 +31,7 @@ import java.util.ListResourceBundle;
* Also you need to update the count of messages(MAX_CODE)or
* the count of warnings(MAX_WARNING) [ Information purpose only]
* @xsl.usage advanced
* @LastModified: Nov 2021
* @LastModified: May 2022
*/
public class XPATHErrorResources_ja extends ListResourceBundle
{
@ -592,7 +592,7 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"rtf()\u306FXRTreeFragSelectWrapper\u306B\u3088\u3063\u3066\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093"},
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
{ ER_ASNODEITERATOR_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"asNodeIterator()\u306FXRTreeFragSelectWrapper\u306B\u3088\u3063\u3066\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093"},
/** detach() not supported by XRTreeFragSelectWrapper */

6
src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java
View File

@ -1,6 +1,5 @@
/*
* reserved comment block
* DO NOT REMOVE OR ALTER!
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -32,6 +31,7 @@ import java.util.ListResourceBundle;
* Also you need to update the count of messages(MAX_CODE)or
* the count of warnings(MAX_WARNING) [ Information purpose only]
* @xsl.usage advanced
* @LastModified: May 2022
*/
public class XPATHErrorResources_ko extends ListResourceBundle
{
@ -578,7 +578,7 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"XRTreeFragSelectWrapper\uB294 rtf()\uB97C \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
{ ER_ASNODEITERATOR_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"XRTreeFragSelectWrapper\uB294 asNodeIterator()\uB97C \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
/** detach() not supported by XRTreeFragSelectWrapper */

6
src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java
View File

@ -1,6 +1,5 @@
/*
* reserved comment block
* DO NOT REMOVE OR ALTER!
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -32,6 +31,7 @@ import java.util.ListResourceBundle;
* Also you need to update the count of messages(MAX_CODE)or
* the count of warnings(MAX_WARNING) [ Information purpose only]
* @xsl.usage advanced
* @LastModified: May 2022
*/
public class XPATHErrorResources_pt_BR extends ListResourceBundle
{
@ -578,7 +578,7 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"rtf() n\u00E3o suportado por XRTreeFragSelectWrapper"},
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
{ ER_ASNODEITERATOR_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"asNodeIterator() n\u00E3o suportado por XRTreeFragSelectWrapper"},
/** detach() not supported by XRTreeFragSelectWrapper */

6
src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java
View File

@ -1,6 +1,5 @@
/*
* reserved comment block
* DO NOT REMOVE OR ALTER!
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -32,6 +31,7 @@ import java.util.ListResourceBundle;
* Also you need to update the count of messages(MAX_CODE)or
* the count of warnings(MAX_WARNING) [ Information purpose only]
* @xsl.usage advanced
* @LastModified: May 2022
*/
public class XPATHErrorResources_sv extends ListResourceBundle
{
@ -578,7 +578,7 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"rtf() st\u00F6ds inte av XRTreeFragSelectWrapper"},
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
{ ER_ASNODEITERATOR_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"asNodeIterator() st\u00F6ds inte av XRTreeFragSelectWrapper"},
/** detach() not supported by XRTreeFragSelectWrapper */

6
src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -31,7 +31,7 @@ import java.util.ListResourceBundle;
* Also you need to update the count of messages(MAX_CODE)or
* the count of warnings(MAX_WARNING) [ Information purpose only]
* @xsl.usage advanced
* @LastModified: Nov 2021
* @LastModified: May 2022
*/
public class XPATHErrorResources_zh_CN extends ListResourceBundle
{
@ -592,7 +592,7 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"XRTreeFragSelectWrapper \u4E0D\u652F\u6301 rtf()"},
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
{ ER_ASNODEITERATOR_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"XRTreeFragSelectWrapper \u4E0D\u652F\u6301 asNodeIterator()"},
/** detach() not supported by XRTreeFragSelectWrapper */

6
src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java
View File

@ -1,6 +1,5 @@
/*
* reserved comment block
* DO NOT REMOVE OR ALTER!
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -32,6 +31,7 @@ import java.util.ListResourceBundle;
* Also you need to update the count of messages(MAX_CODE)or
* the count of warnings(MAX_WARNING) [ Information purpose only]
* @xsl.usage advanced
* @LastModified: May 2022
*/
public class XPATHErrorResources_zh_TW extends ListResourceBundle
{
@ -578,7 +578,7 @@ public static final String ER_IGNORABLE_WHITESPACE_NOT_HANDLED =
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"XRTreeFragSelectWrapper \u4E0D\u652F\u63F4 rtf()"},
{ ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
{ ER_ASNODEITERATOR_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
"XRTreeFragSelectWrapper \u4E0D\u652F\u63F4 asNodeIterator()"},
/** detach() not supported by XRTreeFragSelectWrapper */