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/08/30 05:35:05 UTC
svn commit: r809243 - in
/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces: dom/
impl/dv/ impl/msg/ impl/xs/ jaxp/validation/ util/ xinclude/ xpointer/
Author: mrglavas
Date: Sun Aug 30 03:35:05 2009
New Revision: 809243
URL: http://svn.apache.org/viewvc?rev=809243&view=rev
Log:
Fixing a bug where we were sometimes ignoring a null setting for the locale. Miscellaneous clean-up in 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/dv/DatatypeException.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/MessageFormatter.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=809243&r1=809242&r2=809243&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 Sun Aug 30 03:35:05 2009
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-
package org.apache.xerces.dom;
+
import java.util.Locale;
import java.util.MissingResourceException;
-import java.util.PropertyResourceBundle;
import java.util.ResourceBundle;
/**
@@ -31,6 +30,7 @@
* @version $Id$
*/
public class DOMMessageFormatter {
+
public static final String DOM_DOMAIN = "http://www.w3.org/dom/DOMTR";
public static final String XML_DOMAIN = "http://www.w3.org/TR/1998/REC-xml-19980210";
public static final String SERIALIZER_DOMAIN = "http://apache.org/xml/serializer";
@@ -40,10 +40,10 @@
private static ResourceBundle serResourceBundle = null;
private static Locale locale = null;
-
- DOMMessageFormatter(){
+ DOMMessageFormatter() {
locale = Locale.getDefault();
}
+
/**
* Formats a message with the specified arguments using the given
* locale information.
@@ -106,27 +106,32 @@
return msg;
}
- static ResourceBundle getResourceBundle(String domain){
- if(domain == DOM_DOMAIN || domain.equals(DOM_DOMAIN))
+ static ResourceBundle getResourceBundle(String domain) {
+ if (domain == DOM_DOMAIN || domain.equals(DOM_DOMAIN)) {
return domResourceBundle;
- else if( domain == XML_DOMAIN || domain.equals(XML_DOMAIN))
+ }
+ else if (domain == XML_DOMAIN || domain.equals(XML_DOMAIN)) {
return xmlResourceBundle;
- else if(domain == SERIALIZER_DOMAIN || domain.equals(SERIALIZER_DOMAIN))
+ }
+ else if (domain == SERIALIZER_DOMAIN || domain.equals(SERIALIZER_DOMAIN)) {
return serResourceBundle;
+ }
return null;
}
+
/**
* Initialize Message Formatter.
*/
public static void init(){
if (locale != null) {
- domResourceBundle = PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.DOMMessages", locale);
- serResourceBundle = PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLSerializerMessages", locale);
- xmlResourceBundle = PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLMessages", locale);
- }else{
- domResourceBundle = PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.DOMMessages");
- serResourceBundle = PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLSerializerMessages");
- xmlResourceBundle = PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLMessages");
+ 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");
}
}
@@ -134,7 +139,7 @@
* Set Locale to be used by the formatter.
* @param dlocale
*/
- public static void setLocale(Locale dlocale){
+ public static void setLocale(Locale dlocale) {
locale = dlocale;
}
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/DatatypeException.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/DatatypeException.java?rev=809243&r1=809242&r2=809243&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/DatatypeException.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/DatatypeException.java Sun Aug 30 03:35:05 2009
@@ -18,7 +18,6 @@
package org.apache.xerces.impl.dv;
import java.util.MissingResourceException;
-import java.util.PropertyResourceBundle;
import java.util.ResourceBundle;
/**
@@ -82,7 +81,7 @@
*/
public String getMessage() {
ResourceBundle resourceBundle = null;
- resourceBundle = PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLSchemaMessages");
+ resourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLSchemaMessages");
if (resourceBundle == null)
throw new MissingResourceException("Property file not found!", "org.apache.xerces.impl.msg.XMLSchemaMessages", key);
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=809243&r1=809242&r2=809243&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 Sun Aug 30 03:35:05 2009
@@ -19,7 +19,6 @@
import java.util.Locale;
import java.util.MissingResourceException;
-import java.util.PropertyResourceBundle;
import java.util.ResourceBundle;
import org.apache.xerces.util.MessageFormatter;
@@ -69,12 +68,13 @@
if (fResourceBundle == null || locale != fLocale) {
if (locale != null) {
- fResourceBundle = PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLMessages", locale);
- // memorize the most-recent locale
- fLocale = locale;
+ fResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLMessages", locale);
}
- if (fResourceBundle == null)
- fResourceBundle = PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLMessages");
+ else {
+ fResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLMessages");
+ }
+ // memorize the most-recent locale
+ fLocale = locale;
}
// format message
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=809243&r1=809242&r2=809243&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 Sun Aug 30 03:35:05 2009
@@ -19,12 +19,10 @@
import java.util.Locale;
import java.util.MissingResourceException;
-import java.util.PropertyResourceBundle;
import java.util.ResourceBundle;
import org.apache.xerces.util.MessageFormatter;
-
/**
* SchemaMessageProvider implements an XMLMessageProvider that
* provides localizable error messages for the W3C XML Schema Language
@@ -65,12 +63,13 @@
if (fResourceBundle == null || locale != fLocale) {
if (locale != null) {
- fResourceBundle = PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLSchemaMessages", locale);
- // memorize the most-recent locale
- fLocale = locale;
+ fResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLSchemaMessages", locale);
+ }
+ else {
+ fResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLSchemaMessages");
}
- if (fResourceBundle == null)
- fResourceBundle = PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLSchemaMessages");
+ // memorize the most-recent locale
+ fLocale = locale;
}
String msg = fResourceBundle.getString(key);
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=809243&r1=809242&r2=809243&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 Sun Aug 30 03:35:05 2009
@@ -19,7 +19,6 @@
import java.util.Locale;
import java.util.MissingResourceException;
-import java.util.PropertyResourceBundle;
import java.util.ResourceBundle;
/**
@@ -52,11 +51,11 @@
ResourceBundle resourceBundle = null;
if (locale != null) {
resourceBundle =
- PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.JAXPValidationMessages", locale);
+ ResourceBundle.getBundle("org.apache.xerces.impl.msg.JAXPValidationMessages", locale);
}
else {
resourceBundle =
- PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.JAXPValidationMessages");
+ ResourceBundle.getBundle("org.apache.xerces.impl.msg.JAXPValidationMessages");
}
// format message
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=809243&r1=809242&r2=809243&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 Sun Aug 30 03:35:05 2009
@@ -19,7 +19,6 @@
import java.util.Locale;
import java.util.MissingResourceException;
-import java.util.PropertyResourceBundle;
import java.util.ResourceBundle;
/**
@@ -54,11 +53,11 @@
ResourceBundle resourceBundle = null;
if (locale != null) {
resourceBundle =
- PropertyResourceBundle.getBundle(BASE_NAME, locale);
+ ResourceBundle.getBundle(BASE_NAME, locale);
}
else {
resourceBundle =
- PropertyResourceBundle.getBundle(BASE_NAME);
+ ResourceBundle.getBundle(BASE_NAME);
}
// format message
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/MessageFormatter.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/MessageFormatter.java?rev=809243&r1=809242&r2=809243&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/MessageFormatter.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/MessageFormatter.java Sun Aug 30 03:35:05 2009
@@ -22,7 +22,7 @@
/**
* This interface provides a generic message formatting mechanism and
- * is useful for producing messages that must be localed and/or formatted
+ * is useful for producing messages that must be localized and/or formatted
* with replacement text.
*
* @see org.apache.xerces.impl.XMLErrorReporter
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=809243&r1=809242&r2=809243&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 Sun Aug 30 03:35:05 2009
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.xerces.util;
import java.util.Locale;
import java.util.MissingResourceException;
-import java.util.PropertyResourceBundle;
import java.util.ResourceBundle;
/**
@@ -52,11 +52,11 @@
ResourceBundle resourceBundle = null;
if (locale != null) {
resourceBundle =
- PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.SAXMessages", locale);
+ ResourceBundle.getBundle("org.apache.xerces.impl.msg.SAXMessages", locale);
}
else {
resourceBundle =
- PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.SAXMessages");
+ ResourceBundle.getBundle("org.apache.xerces.impl.msg.SAXMessages");
}
// format message
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=809243&r1=809242&r2=809243&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 Sun Aug 30 03:35:05 2009
@@ -19,7 +19,6 @@
import java.util.Locale;
import java.util.MissingResourceException;
-import java.util.PropertyResourceBundle;
import java.util.ResourceBundle;
import org.apache.xerces.util.MessageFormatter;
@@ -60,12 +59,13 @@
if (fResourceBundle == null || locale != fLocale) {
if (locale != null) {
- fResourceBundle = PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.XIncludeMessages", locale);
- // memorize the most-recent locale
- fLocale = locale;
+ fResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XIncludeMessages", locale);
}
- if (fResourceBundle == null)
- fResourceBundle = PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.XIncludeMessages");
+ else {
+ fResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XIncludeMessages");
+ }
+ // memorize the most-recent locale
+ fLocale = locale;
}
String msg = fResourceBundle.getString(key);
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=809243&r1=809242&r2=809243&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 Sun Aug 30 03:35:05 2009
@@ -18,7 +18,6 @@
import java.util.Locale;
import java.util.MissingResourceException;
-import java.util.PropertyResourceBundle;
import java.util.ResourceBundle;
import org.apache.xerces.util.MessageFormatter;
@@ -63,14 +62,13 @@
if (fResourceBundle == null || locale != fLocale) {
if (locale != null) {
- fResourceBundle = PropertyResourceBundle.getBundle(
- "org.apache.xerces.impl.msg.XPointerMessages", locale);
- // memorize the most-recent locale
- fLocale = locale;
+ fResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XPointerMessages", locale);
}
- if (fResourceBundle == null)
- fResourceBundle = PropertyResourceBundle
- .getBundle("org.apache.xerces.impl.msg.XPointerMessages");
+ else {
+ fResourceBundle = ResourceBundle.getBundle("org.apache.xerces.impl.msg.XPointerMessages");
+ }
+ // memorize the most-recent locale
+ fLocale = locale;
}
String msg = fResourceBundle.getString(key);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org