svn commit: r477446 - /incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Localizer.java

[mp...@apache.org]

Author: mprudhom
Date: Mon Nov 20 16:42:53 2006
New Revision: 477446

URL: http://svn.apache.org/viewvc?view=rev&rev=477446
Log:
Added back the ability to call getPackageName() on the Message object.

Modified:
    incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Localizer.java

Modified: incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Localizer.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Localizer.java?view=diff&rev=477446&r1=477445&r2=477446
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Localizer.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Localizer.java Mon Nov 20 16:42:53 2006
@@ -78,11 +78,15 @@
             locale = Locale.getDefault();
 
         int dot = (cls == null) ? -1 : cls.getName().lastIndexOf('.');
+        String pkg;
         String file;
-        if (dot == -1)
+        if (dot == -1) {
+            pkg = "";
             file = "localizer";
-        else
-            file = cls.getName().substring(0, dot + 1) + "localizer";
+        } else {
+            pkg = cls.getName().substring(0, dot);
+            file = pkg + ".localizer";
+        }
         String key = file + locale.toString();
 
         // no locking; ok if bundle created multiple times
@@ -91,7 +95,7 @@
         if (loc != null)
             return loc;
         else {
-            loc = new Localizer(cls, file, locale, 
+            loc = new Localizer(pkg, file, locale, 
                 cls == null ? null : cls.getClassLoader());
             _localizers.put(key, loc);
             return loc;
@@ -113,13 +117,13 @@
     }
 
     private String _file;
+    private String _pkg;
     private ResourceBundle _bundle = null;
-    private Class _cls;
     private Locale _locale;
     private ClassLoader _loader;
 
-    private Localizer(Class c, String f, Locale locale, ClassLoader loader) {
-        _cls = c;
+    private Localizer(String pkg, String f, Locale locale, ClassLoader loader) {
+        _pkg = pkg;
         _file = f;
         _locale = locale;
         _loader = loader;
@@ -212,7 +216,7 @@
      * @see #get(String)
      */
     public Message get(String key, Object[] subs) {
-        return new Message(_cls, getBundle(), key, subs, false);
+        return new Message(_pkg, getBundle(), key, subs, false);
     }
 
     /**
@@ -224,7 +228,7 @@
      * @see #getFatal(String)
      */
     public Message getFatal(String key, Object[] subs) {
-        return new Message(_cls, getBundle(), key, subs, true);
+        return new Message(_pkg, getBundle(), key, subs, true);
     }
 
     /**
@@ -234,17 +238,17 @@
      */
     public static class Message {
 
-        private final Class _cls;
+        private final String _pkg;
         private final String _key;
         private final Object[] _subs;
         private final String _localizedMessage;
 
-        private Message(Class cls, ResourceBundle bundle, String key, 
+        private Message(String packageName, ResourceBundle bundle, String key, 
             Object[] subs, boolean fatal) {
             if (bundle == null && fatal)
                 throw new MissingResourceException(key, key, key);
 
-            _cls = cls;
+            _pkg = packageName;
             _key = key;
             _subs = subs;
             if (bundle == null) {
@@ -280,6 +284,10 @@
          */
         public Object[] getSubstitutions() {
             return _subs;
+        }
+
+        public String getPackageName() {
+            return _pkg;
         }
 
         public String toString() {