WebSVN - OpenConcerto - Diff - Rev 156 and 177 - /trunk/OpenConcerto/src/org/openconcerto/utils/i18n/TM.java

 import com.ibm.icu.text.MessageFormat;
 import com.ibm.icu.text.MessagePattern;
 import com.ibm.icu.text.MessagePattern.Part;
 import com.ibm.icu.text.MessagePattern.Part.Type;
+import net.jcip.annotations.ThreadSafe;
 /**
  * Translation manager. The translations are provided by {@link Translator} instances, they are
  * created either from a class ending in a language tag that implements it, or by properties files
  * that must contain values that will be passed to {@link MessageFormat}. In the latter case,
  * messages can reference {@link #createValue(Map, Object[], String) virtual named arguments}.
+ *
  * @author Sylvain
  * @see LocalizedInstances
  */
+@ThreadSafe
 public class TM {
     static public enum MissingMode {
         EXCEPTION {
             @Override
         assert NOUN_CLASS_PROP.equals(Introspector.decapitalize(NounClass.class.getSimpleName()));
+    }
     static private final MissingMode DEFAULT_MISSING_MODE = MissingMode.STRING;
-    static private final TM INSTANCE = new TM();
+    private static final TMPool<TM> POOL = new TMPool<TM>(TM::new);
     static private final Pattern splitPtrn = Pattern.compile("__", Pattern.LITERAL);
     static private boolean USE_DYNAMIC_MAP = true;
-    public static void setUseDynamicMap(boolean b) {
+    public static synchronized void setUseDynamicMap(boolean b) {
         USE_DYNAMIC_MAP = b;
+    }
     /**
      * Whether to use a {@link DynamicMap} or add all possible keys up front.
      * plurals and choices it might make a difference. However <code>DynamicMap</code> is less
      * robust, since it twists a little the definition of {@link Map}.
+     *
      * @return <code>true</code> if <code>DynamicMap</code> should be used.
      */
-    public static boolean useDynamicMap() {
+    public static synchronized boolean useDynamicMap() {
         return USE_DYNAMIC_MAP;
+    }
+    /**
+     * The default locale for {@link #getInstance()}. Currently just {@link Locale#getDefault()}.
+     *
+     * @return the default locale.
+     */
+    public static final Locale getDefaultLocale() {
+        return Locale.getDefault();
+    }
     static public TM getInstance() {
+        return getInstance(getDefaultLocale());
+    }
+    static public TM getInstance(final Locale l) {
-        return INSTANCE;
+        return POOL.get(l);
+    }
+    static public String tr(final Locale l, final String key, final Object... args) {
+        return getInstance(l).translate(key, args);
+    }
     static public String tr(final String key, final Object... args) {
         return getInstance().translate(key, args);
+    }
     private Locale locale;
     private TranslatorChain translations;
     private Locale translationsLocale;
-    protected TM() {
-        init();
-    }
-    protected void init() {
+    protected TM(final Locale locale) {
-        setLocale(Locale.getDefault());
+        setLocale(locale);
+    }
-    public final void setLocale(final Locale locale) {
+    private final void setLocale(final Locale locale) {
-        this.locale = locale;
         final LocalizedInstances<Translator> localizedInstances = new LocalizedInstances<Translator>(Translator.class, TranslationManager.getControl()) {
             @Override
             protected Translator createInstance(final String bundleName, final Locale l, final Class<?> cl) throws IOException {
                 final Properties props = PropertiesUtils.createFromResource(cl, '/' + this.getControl().toResourceName(bundleName, "properties"));
                 if (props == null) {
                     };
+                }
             };
         };
         final Tuple2<Locale, List<Translator>> createInstances = localizedInstances.createInstances(getBaseName(), locale);
+        synchronized (this) {
+            this.locale = locale;
-        this.translationsLocale = createInstances.get0();
+            this.translationsLocale = createInstances.get0();
-        this.translations = new TranslatorChain(createInstances.get1());
+            this.translations = new TranslatorChain(createInstances.get1());
+        }
+    }
     /**
      * The requested locale.
+     *
      * @return the requested locale.
      * @see #setLocale(Locale)
      */
-    public final Locale getLocale() {
+    public final synchronized Locale getLocale() {
         return this.locale;
+    }
     /**
      * The actual locale of the loaded translations.
+     *
      * @return the actual locale.
      */
-    public final Locale getTranslationsLocale() {
+    public final synchronized Locale getTranslationsLocale() {
         return this.translationsLocale;
+    }
+    private final synchronized TranslatorChain getTranslations() {
+        return this.translations;
+    }
     protected String getBaseName() {
         return I18nUtils.getBaseName(this.getClass());
+    }
     // translate array
     private final String translate(final MissingMode mode, final String key, MessageArgs args) throws MissingResourceException {
         Objects.requireNonNull(mode, "Null mode");
         Objects.requireNonNull(key, "Null key");
         Objects.requireNonNull(args, "Null arguments");
-        final String res = this.translations.translate(key, args);
+        final String res = this.getTranslations().translate(key, args);
         return mode.returnResult(this, res, key);
+    }
     protected MessageArgs replaceMap(final MessageArgs args, final String msg) {
         final MessageArgs res;

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/utils/i18n/TM.java - Rev 156 → 177