cvs commit: xml-xerces/java/src/org/apache/xerces/dom DOMMessageFormatter.java

[venu]

venu        2004/07/12 16:44:28

  Modified:    java/src/org/apache/xerces/dom DOMMessageFormatter.java
  Log:
  fixed a bug ,where wrong property file was being used for domain XML and SERIALIZER.
  
  Revision  Changes    Path
  1.6       +9 -12     
xml-xerces/java/src/org/apache/xerces/dom/DOMMessageFormatter.java
  
  Index: DOMMessageFormatter.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xerces/dom/DOMMessageFormatter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DOMMessageFormatter.java  9 Jul 2004 10:17:18 -0000       1.5
  +++ DOMMessageFormatter.java  12 Jul 2004 23:44:28 -0000      1.6
  @@ -79,10 +79,7 @@
                       msg += " " + resourceBundle.getString(key);
                   }
               }
  -        }
  -        
  -        
  -        // error
  +        } // error
           catch (MissingResourceException e) {
               msg = resourceBundle.getString("BadMessageKey");
               throw new MissingResourceException(key, msg, key);
  @@ -107,11 +104,11 @@
       }
       
       static ResourceBundle getResourceBundle(String domain){
  -        if(domain == DOM_DOMAIN)
  +        if(domain == DOM_DOMAIN || domain.equals(DOM_DOMAIN))
               return domResourceBundle;
  -        else if( domain == XML_DOMAIN)
  +        else if( domain == XML_DOMAIN || domain.equals(XML_DOMAIN))
               return xmlResourceBundle;
  -        else if(domain == SERIALIZER_DOMAIN)
  +        else if(domain == SERIALIZER_DOMAIN || domain.equals(SERIALIZER_DOMAIN))
               return serResourceBundle;
           return null;
       }
  @@ -121,12 +118,12 @@
       public static void init(){
           if (locale != null) {
               domResourceBundle = 
PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.DOMMessages", locale);
  -            xmlResourceBundle = 
PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLSerializerMessages", 
locale);
  -            serResourceBundle = 
PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLMessages", 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");
  -            xmlResourceBundle = 
PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLSerializerMessages");
  -            serResourceBundle = 
PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLMessages");
  +            serResourceBundle = 
PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLSerializerMessages");
  +            xmlResourceBundle = 
PropertyResourceBundle.getBundle("org.apache.xerces.impl.msg.XMLMessages");
           }
       }
       
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]