You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mr...@apache.org on 2009/09/09 21:40:36 UTC
svn commit: r813089 - in
/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces: dom/
impl/msg/ impl/xs/ jaxp/validation/ util/ xinclude/ xpointer/
Author: mrglavas
Date: Wed Sep 9 19:40:36 2009
New Revision: 813089
URL: http://svn.apache.org/viewvc?rev=813089&view=rev
Log:
Fixing a bug. If the default locale is changed in many cases we weren't picking up the new one. This also simplifies the logic in many of the message formatters.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMMessageFormatter.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLMessageFormatter.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSMessageFormatter.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/validation/JAXPValidationMessageFormatter.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/DatatypeMessageFormatter.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/SAXMessageFormatter.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xinclude/XIncludeMessageFormatter.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xpointer/XPointerMessageFormatter.java
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMMessageFormatter.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMMessageFormatter.java?rev=813089&r1=813088&r2=813089&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMMessageFormatter.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMMessageFormatter.java Wed Sep 9 19:40:36 2009
@@ -122,17 +122,14 @@
/**
* Initialize Message Formatter.
*/
- public static void init(){
- if (locale != null) {
- domResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.DOMMessages", locale);
- serResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLSerializerMessages", locale);
- xmlResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLMessages", locale);
- }
- else {
- domResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.DOMMessages");
- serResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLSerializerMessages");
- xmlResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLMessages");
+ public static void init() {
+ Locale _locale = locale;
+ if (_locale == null) {
+ _locale = Locale.getDefault();
}
+ domResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.DOMMessages", _locale);
+ serResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLSerializerMessages", _locale);
+ xmlResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLMessages", _locale);
}
/**
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLMessageFormatter.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLMessageFormatter.java?rev=813089&r1=813088&r2=813089&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLMessageFormatter.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLMessageFormatter.java Wed Sep 9 19:40:36 2009
@@ -66,13 +66,11 @@
public String formatMessage(Locale locale, String key, Object[] arguments)
throws MissingResourceException {
- if (fResourceBundle == null || locale != fLocale) {
- if (locale != null) {
- fResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLMessages", locale);
- }
- else {
- fResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLMessages");
- }
+ if (locale == null) {
+ locale = Locale.getDefault();
+ }
+ if (locale != fLocale) {
+ fResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLMessages", locale);
// memorize the most-recent locale
fLocale = locale;
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSMessageFormatter.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSMessageFormatter.java?rev=813089&r1=813088&r2=813089&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSMessageFormatter.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSMessageFormatter.java Wed Sep 9 19:40:36 2009
@@ -58,20 +58,18 @@
* @throws MissingResourceException Thrown if the message with the
* specified key cannot be found.
*/
- public String formatMessage(Locale locale, String key, Object[] arguments)
+ public String formatMessage(Locale locale, String key, Object[] arguments)
throws MissingResourceException {
-
- if (fResourceBundle == null || locale != fLocale) {
- if (locale != null) {
- fResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLSchemaMessages", locale);
- }
- else {
- fResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLSchemaMessages");
- }
+
+ if (locale == null) {
+ locale = Locale.getDefault();
+ }
+ if (locale != fLocale) {
+ fResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLSchemaMessages", locale);
// memorize the most-recent locale
fLocale = locale;
}
-
+
String msg = fResourceBundle.getString(key);
if (arguments != null) {
try {
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/validation/JAXPValidationMessageFormatter.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/validation/JAXPValidationMessageFormatter.java?rev=813089&r1=813088&r2=813089&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/validation/JAXPValidationMessageFormatter.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/validation/JAXPValidationMessageFormatter.java Wed Sep 9 19:40:36 2009
@@ -48,15 +48,11 @@
String key, Object[] arguments)
throws MissingResourceException {
- ResourceBundle resourceBundle = null;
- if (locale != null) {
- resourceBundle =
- ResourceBundle.getBundle("org.apache.xerces.impl.msg.JAXPValidationMessages", locale);
- }
- else {
- resourceBundle =
- ResourceBundle.getBundle("org.apache.xerces.impl.msg.JAXPValidationMessages");
+ if (locale == null) {
+ locale = Locale.getDefault();
}
+ final ResourceBundle resourceBundle =
+ ResourceBundle.getBundle("org.apache.xerces.impl.msg.JAXPValidationMessages", locale);
// format message
String msg;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/DatatypeMessageFormatter.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/DatatypeMessageFormatter.java?rev=813089&r1=813088&r2=813089&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/DatatypeMessageFormatter.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/DatatypeMessageFormatter.java Wed Sep 9 19:40:36 2009
@@ -50,15 +50,11 @@
String key, Object[] arguments)
throws MissingResourceException {
- ResourceBundle resourceBundle = null;
- if (locale != null) {
- resourceBundle =
- ResourceBundle.getBundle(BASE_NAME, locale);
- }
- else {
- resourceBundle =
- ResourceBundle.getBundle(BASE_NAME);
+ if (locale == null) {
+ locale = Locale.getDefault();
}
+ final ResourceBundle resourceBundle =
+ ResourceBundle.getBundle(BASE_NAME, locale);
// format message
String msg;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/SAXMessageFormatter.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/SAXMessageFormatter.java?rev=813089&r1=813088&r2=813089&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/SAXMessageFormatter.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/SAXMessageFormatter.java Wed Sep 9 19:40:36 2009
@@ -49,15 +49,11 @@
String key, Object[] arguments)
throws MissingResourceException {
- ResourceBundle resourceBundle = null;
- if (locale != null) {
- resourceBundle =
- ResourceBundle.getBundle("org.apache.xerces.impl.msg.SAXMessages", locale);
- }
- else {
- resourceBundle =
- ResourceBundle.getBundle("org.apache.xerces.impl.msg.SAXMessages");
+ if (locale == null) {
+ locale = Locale.getDefault();
}
+ final ResourceBundle resourceBundle =
+ ResourceBundle.getBundle("org.apache.xerces.impl.msg.SAXMessages", locale);
// format message
String msg;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xinclude/XIncludeMessageFormatter.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xinclude/XIncludeMessageFormatter.java?rev=813089&r1=813088&r2=813089&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xinclude/XIncludeMessageFormatter.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xinclude/XIncludeMessageFormatter.java Wed Sep 9 19:40:36 2009
@@ -54,20 +54,18 @@
* @throws MissingResourceException Thrown if the message with the
* specified key cannot be found.
*/
- public String formatMessage(Locale locale, String key, Object[] arguments)
+ public String formatMessage(Locale locale, String key, Object[] arguments)
throws MissingResourceException {
-
- if (fResourceBundle == null || locale != fLocale) {
- if (locale != null) {
- fResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XIncludeMessages", locale);
- }
- else {
- fResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XIncludeMessages");
- }
+
+ if (locale == null) {
+ locale = Locale.getDefault();
+ }
+ if (locale != fLocale) {
+ fResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XIncludeMessages", locale);
// memorize the most-recent locale
fLocale = locale;
}
-
+
String msg = fResourceBundle.getString(key);
if (arguments != null) {
try {
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xpointer/XPointerMessageFormatter.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xpointer/XPointerMessageFormatter.java?rev=813089&r1=813088&r2=813089&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xpointer/XPointerMessageFormatter.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xpointer/XPointerMessageFormatter.java Wed Sep 9 19:40:36 2009
@@ -60,13 +60,11 @@
public String formatMessage(Locale locale, String key, Object[] arguments)
throws MissingResourceException {
- if (fResourceBundle == null || locale != fLocale) {
- if (locale != null) {
- fResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XPointerMessages", locale);
- }
- else {
- fResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XPointerMessages");
- }
+ if (locale == null) {
+ locale = Locale.getDefault();
+ }
+ if (locale != fLocale) {
+ fResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XPointerMessages", locale);
// memorize the most-recent locale
fLocale = locale;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org