diff -r 4af5dc2d5794 -r cda839ac048f jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java Tue Apr 09 12:05:27 2013 +0400
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java Mon Apr 22 11:23:33 2013 +0100
@@ -2,21 +2,23 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-/*
- * Copyright 1999-2004 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.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package com.sun.org.apache.xml.internal.security.utils;
@@ -31,202 +33,136 @@
*/
public class I18n {
- /** Field NOT_INITIALIZED_MSG */
- public static final String NOT_INITIALIZED_MSG =
- "You must initialize the xml-security library correctly before you use it. "
- + "Call the static method \"com.sun.org.apache.xml.internal.security.Init.init();\" to do that "
- + "before you use any functionality from that library.";
+ /** Field NOT_INITIALIZED_MSG */
+ public static final String NOT_INITIALIZED_MSG =
+ "You must initialize the xml-security library correctly before you use it. "
+ + "Call the static method \"com.sun.org.apache.xml.internal.security.Init.init();\" to do that "
+ + "before you use any functionality from that library.";
- /** Field defaultLanguageCode */
- private static String defaultLanguageCode; // will be set in static{} block
-
- /** Field defaultCountryCode */
- private static String defaultCountryCode; // will be set in static{} block
-
- /** Field resourceBundle */
- private static ResourceBundle resourceBundle =
- ResourceBundle.getBundle
- (Constants.exceptionMessagesResourceBundleBase, Locale.US);
+ /** Field resourceBundle */
+ private static ResourceBundle resourceBundle;
- /** Field alreadyInitialized */
- private static boolean alreadyInitialized = false;
-
- /** Field _languageCode */
- private static String _languageCode = null;
-
- /** Field _countryCode */
- private static String _countryCode = null;
+ /** Field alreadyInitialized */
+ private static boolean alreadyInitialized = false;
- /**
- * Constructor I18n
- *
- */
- private I18n() {
-
- // we don't allow instantiation
- }
+ /**
+ * Constructor I18n
+ *
+ */
+ private I18n() {
+ // we don't allow instantiation
+ }
- /**
- * Method translate
- *
- * translates a message ID into an internationalized String, see alse
- * XMLSecurityException.getExceptionMEssage(). The strings are
- * stored in the ResourceBundle, which is identified in
- * exceptionMessagesResourceBundleBase
- *
- * @param message
- * @param args is an Object[] array of strings which are inserted into the String which is retrieved from the ResouceBundle
- * @return message translated
- */
- public static String translate(String message, Object[] args) {
- return getExceptionMessage(message, args);
- }
-
- /**
- * Method translate
- *
- * translates a message ID into an internationalized String, see alse
- * XMLSecurityException.getExceptionMEssage()
- *
- * @param message
- * @return message translated
- */
- public static String translate(String message) {
- return getExceptionMessage(message);
- }
+ /**
+ * Method translate
+ *
+ * translates a message ID into an internationalized String, see alse
+ * XMLSecurityException.getExceptionMEssage(). The strings are
+ * stored in the ResourceBundle, which is identified in
+ * exceptionMessagesResourceBundleBase
+ *
+ * @param message
+ * @param args is an Object[] array of strings which are inserted into
+ * the String which is retrieved from the ResouceBundle
+ * @return message translated
+ */
+ public static String translate(String message, Object[] args) {
+ return getExceptionMessage(message, args);
+ }
- /**
- * Method getExceptionMessage
- *
- * @param msgID
- * @return message translated
- *
- */
- public static String getExceptionMessage(String msgID) {
-
- try {
- String s = resourceBundle.getString(msgID);
-
- return s;
- } catch (Throwable t) {
- if (com.sun.org.apache.xml.internal.security.Init.isInitialized()) {
- return "No message with ID \"" + msgID
- + "\" found in resource bundle \""
- + Constants.exceptionMessagesResourceBundleBase + "\"";
- }
- return I18n.NOT_INITIALIZED_MSG;
- }
- }
-
- /**
- * Method getExceptionMessage
- *
- * @param msgID
- * @param originalException
- * @return message translated
- */
- public static String getExceptionMessage(String msgID,
- Exception originalException) {
+ /**
+ * Method translate
+ *
+ * translates a message ID into an internationalized String, see also
+ * XMLSecurityException.getExceptionMessage()
+ *
+ * @param message
+ * @return message translated
+ */
+ public static String translate(String message) {
+ return getExceptionMessage(message);
+ }
- try {
- Object exArgs[] = { originalException.getMessage() };
- String s = MessageFormat.format(resourceBundle.getString(msgID),
- exArgs);
-
- return s;
- } catch (Throwable t) {
- if (com.sun.org.apache.xml.internal.security.Init.isInitialized()) {
- return "No message with ID \"" + msgID
- + "\" found in resource bundle \""
- + Constants.exceptionMessagesResourceBundleBase
- + "\". Original Exception was a "
- + originalException.getClass().getName() + " and message "
- + originalException.getMessage();
- }
- return I18n.NOT_INITIALIZED_MSG;
- }
- }
-
- /**
- * Method getExceptionMessage
- *
- * @param msgID
- * @param exArgs
- * @return message translated
- */
- public static String getExceptionMessage(String msgID, Object exArgs[]) {
-
- try {
- String s = MessageFormat.format(resourceBundle.getString(msgID),
- exArgs);
-
- return s;
- } catch (Throwable t) {
- if (com.sun.org.apache.xml.internal.security.Init.isInitialized()) {
- return "No message with ID \"" + msgID
- + "\" found in resource bundle \""
- + Constants.exceptionMessagesResourceBundleBase + "\"";
- }
- return I18n.NOT_INITIALIZED_MSG;
- }
- }
+ /**
+ * Method getExceptionMessage
+ *
+ * @param msgID
+ * @return message translated
+ *
+ */
+ public static String getExceptionMessage(String msgID) {
+ try {
+ return resourceBundle.getString(msgID);
+ } catch (Throwable t) {
+ if (com.sun.org.apache.xml.internal.security.Init.isInitialized()) {
+ return "No message with ID \"" + msgID
+ + "\" found in resource bundle \""
+ + Constants.exceptionMessagesResourceBundleBase + "\"";
+ }
+ return I18n.NOT_INITIALIZED_MSG;
+ }
+ }
-//
-// Commented out because it modifies shared static
-// state which could be maliciously called by untrusted code
-//
-// /**
-// * Method init
-// *
-// * @param _defaultLanguageCode
-// * @param _defaultCountryCode
-// */
-// public static void init(String _defaultLanguageCode,
-// String _defaultCountryCode) {
-//
-// I18n.defaultLanguageCode = _defaultLanguageCode;
-//
-// if (I18n.defaultLanguageCode == null) {
-// I18n.defaultLanguageCode = Locale.getDefault().getLanguage();
-// }
-//
-// I18n.defaultCountryCode = _defaultCountryCode;
-//
-// if (I18n.defaultCountryCode == null) {
-// I18n.defaultCountryCode = Locale.getDefault().getCountry();
-// }
-//
-// initLocale(I18n.defaultLanguageCode, I18n.defaultCountryCode);
-// }
+ /**
+ * Method getExceptionMessage
+ *
+ * @param msgID
+ * @param originalException
+ * @return message translated
+ */
+ public static String getExceptionMessage(String msgID, Exception originalException) {
+ try {
+ Object exArgs[] = { originalException.getMessage() };
+ return MessageFormat.format(resourceBundle.getString(msgID), exArgs);
+ } catch (Throwable t) {
+ if (com.sun.org.apache.xml.internal.security.Init.isInitialized()) {
+ return "No message with ID \"" + msgID
+ + "\" found in resource bundle \""
+ + Constants.exceptionMessagesResourceBundleBase
+ + "\". Original Exception was a "
+ + originalException.getClass().getName() + " and message "
+ + originalException.getMessage();
+ }
+ return I18n.NOT_INITIALIZED_MSG;
+ }
+ }
-//
-// Commented out because it modifies shared static
-// state which could be maliciously called by untrusted code
-//
-// /**
-// * Method initLocale
-// *
-// * @param languageCode
-// * @param countryCode
-// */
-// public static void initLocale(String languageCode, String countryCode) {
-//
-// if (alreadyInitialized && languageCode.equals(_languageCode)
-// && countryCode.equals(_countryCode)) {
-// return;
-// }
-//
-// if ((languageCode != null) && (countryCode != null)
-// && (languageCode.length() > 0) && (countryCode.length() > 0)) {
-// _languageCode = languageCode;
-// _countryCode = countryCode;
-// } else {
-// _countryCode = I18n.defaultCountryCode;
-// _languageCode = I18n.defaultLanguageCode;
-// }
-//
-// I18n.resourceBundle =
-// ResourceBundle.getBundle(Constants.exceptionMessagesResourceBundleBase,
-// new Locale(_languageCode, _countryCode));
-// }
+ /**
+ * Method getExceptionMessage
+ *
+ * @param msgID
+ * @param exArgs
+ * @return message translated
+ */
+ public static String getExceptionMessage(String msgID, Object exArgs[]) {
+ try {
+ return MessageFormat.format(resourceBundle.getString(msgID), exArgs);
+ } catch (Throwable t) {
+ if (com.sun.org.apache.xml.internal.security.Init.isInitialized()) {
+ return "No message with ID \"" + msgID
+ + "\" found in resource bundle \""
+ + Constants.exceptionMessagesResourceBundleBase + "\"";
+ }
+ return I18n.NOT_INITIALIZED_MSG;
+ }
+ }
+
+ /**
+ * Method init
+ *
+ * @param languageCode
+ * @param countryCode
+ */
+ public synchronized static void init(String languageCode, String countryCode) {
+ if (alreadyInitialized) {
+ return;
+ }
+
+ I18n.resourceBundle =
+ ResourceBundle.getBundle(
+ Constants.exceptionMessagesResourceBundleBase,
+ new Locale(languageCode, countryCode)
+ );
+ alreadyInitialized = true;
+ }
}