WebSVN - OpenConcerto - Diff - Rev 83 and 174 - /trunk/OpenConcerto/src/org/openconcerto/utils/i18n/TranslationManager.java

 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.ResourceBundle.Control;
+import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import net.jcip.annotations.GuardedBy;
-import net.jcip.annotations.ThreadSafe;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
+import net.jcip.annotations.GuardedBy;
+import net.jcip.annotations.ThreadSafe;
 @ThreadSafe
 public class TranslationManager {
     private static final Locale FALLBACK_LOCALE = Locale.ENGLISH;
     private static final Control CONTROL = new I18nUtils.SameLanguageControl() {
     @GuardedBy("classes")
     private final List<Class<?>> classes;
     @GuardedBy("classes")
     private Locale locale;
-    private final Object trMutex = new String("translations mutex");
+    private final Object trMutex = new Object();
     @GuardedBy("trMutex")
     private Map<String, String> menuTranslation;
     @GuardedBy("trMutex")
     private Map<String, String> itemTranslation;
     @GuardedBy("trMutex")
     private Map<String, String> actionTranslation;
     private TranslationManager() {
-        this.classes = new ArrayList<Class<?>>();
+        this.classes = new ArrayList<>();
+    }
     public void addTranslationStreamFromClass(Class<?> c) {
         synchronized (this.classes) {
             this.classes.add(c);
+        }
+    }
     private void loadAllTranslation() {
         synchronized (this.trMutex) {
-            this.menuTranslation = new HashMap<String, String>();
+            this.menuTranslation = new HashMap<>();
-            this.itemTranslation = new HashMap<String, String>();
+            this.itemTranslation = new HashMap<>();
-            this.actionTranslation = new HashMap<String, String>();
+            this.actionTranslation = new HashMap<>();
-            if (this.classes.size() == 0) {
+            if (this.classes.isEmpty()) {
                 Log.get().warning("TranslationManager has no resources to load (" + this.getLocale() + ")");
+            }
             for (Class<?> c : this.classes) {
                 boolean loaded = loadTranslation(this.getLocale(), c);
                 if (!loaded) {
+    }
     // return all existing (e.g fr_CA only specify differences with fr)
     private List<InputStream> findStream(final Locale locale, final Class<?> c, final boolean rootLast) {
         final Control cntrl = CONTROL;
-        final List<InputStream> res = new ArrayList<InputStream>();
+        final List<InputStream> res = new ArrayList<>();
         final String baseName = c.getPackage().getName() + "." + BASENAME;
         // test emptiness to not mix languages
         for (Locale targetLocale = locale; targetLocale != null && res.isEmpty(); targetLocale = cntrl.getFallbackLocale(baseName, targetLocale)) {
             for (final Locale candidate : cntrl.getCandidateLocales(baseName, targetLocale)) {
     private boolean loadTranslation(final Locale l, Class<?> c) {
         boolean translationLoaded = false;
         // we want more specific translations to replace general ones, i.e. root Locale first
         for (final InputStream input : findStream(l, c, false)) {
             // create new instances to check if there's no duplicates in each resource
-            final Map<String, String> menuTranslation = new HashMap<String, String>(), itemTranslation = new HashMap<String, String>(), actionTranslation = new HashMap<String, String>();
+            final Map<String, String> menuTranslation = new HashMap<>(), itemTranslation = new HashMap<>(), actionTranslation = new HashMap<>();
             loadTranslation(input, menuTranslation, itemTranslation, actionTranslation);
             // on the other hand, it's OK for one resource to override another
             this.menuTranslation.putAll(menuTranslation);
             this.itemTranslation.putAll(itemTranslation);
             this.actionTranslation.putAll(actionTranslation);
             translationLoaded = true;
+        }
         return translationLoaded;
+    }
-    static private void loadTranslation(final InputStream input, final Map<String, String> menuTranslation, final Map<String, String> itemTranslation, final Map<String, String> actionTranslation) {
+    private static void loadTranslation(final InputStream input, final Map<String, String> menuTranslation, final Map<String, String> itemTranslation, final Map<String, String> actionTranslation) {
+        // FIXME : l'implementation de Java est lente
+        // com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl : 60 ms!
+        // On pourrait passer à 1ms avec Piccolo...
         final DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
         try {
+            dbFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+            dbFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
             final DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
             final Document doc = dBuilder.parse(input);
             // Menus
             loadTranslation(doc, "menu", menuTranslation);
             // Items (title, labels not related to fields...)
                 e.printStackTrace();
+            }
+        }
+    }
-    static private void loadTranslation(final Document doc, final String tagName, final Map<String, String> m) {
+    private static void loadTranslation(final Document doc, final String tagName, final Map<String, String> m) {
         final NodeList menuChildren = doc.getElementsByTagName(tagName);
         final int size = menuChildren.getLength();
         for (int i = 0; i < size; i++) {
             final Element element = (Element) menuChildren.item(i);
             final String id = element.getAttributeNode("id").getValue();

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/utils/i18n/TranslationManager.java - Rev 83 → 174