WebSVN - OpenConcerto - Diff - Rev 151 and 156 - /trunk/OpenConcerto/src/org/openconcerto/sql/PropsConfiguration.java

  */
  package org.openconcerto.sql;
 import org.openconcerto.sql.element.SQLElementDirectory;
+import org.openconcerto.sql.element.SQLElementNamesFromXML;
 import org.openconcerto.sql.model.DBRoot;
 import org.openconcerto.sql.model.DBStructureItem;
 import org.openconcerto.sql.model.DBSystemRoot;
 import org.openconcerto.sql.model.FieldMapper;
 import org.openconcerto.sql.model.HierarchyLevel;
 import org.openconcerto.utils.LogUtils;
 import org.openconcerto.utils.MultipleOutputStream;
 import org.openconcerto.utils.NetUtils;
 import org.openconcerto.utils.ProductInfo;
 import org.openconcerto.utils.RTInterruptedException;
+import org.openconcerto.utils.ReflectUtils;
 import org.openconcerto.utils.StreamUtils;
 import org.openconcerto.utils.Tuple2;
 import org.openconcerto.utils.Value;
 import org.openconcerto.utils.cc.IClosure;
 import org.openconcerto.utils.cc.IPredicate;
     public String getDefaultBase() {
         final boolean rootIsBase = this.getSystem().getDBRootLevel().equals(HierarchyLevel.SQLBASE);
         return rootIsBase ? this.getRootName() : this.getSystemRootName();
+    }
+    private final String toClassName(final String rsrcName) {
+        if (rsrcName.charAt(0) == '/')
+            return rsrcName.substring(1).replace('/', '.');
+        else
+            return this.getResourceWD().getPackage().getName() + '.' + rsrcName.replace('/', '.');
+    }
     /**
      * Return the correct stream depending on file mode. If file mode is
      * {@link FileMode#NORMAL_FILE} it will first check if a file named <code>name</code> exists,
      * otherwise it will look in the jar.
+     *
      * @return the corresponding stream, or <code>null</code> if not found.
      */
     public final InputStream getStream(final String name) {
         final File f = getFile(name);
         if (mustUseClassloader(f)) {
-            return this.getClass().getResourceAsStream(name);
+            return getResourceWD().getResourceAsStream(name);
         } else
             try {
                 return new FileInputStream(f);
             } catch (final FileNotFoundException e) {
                 return null;
+            }
+    }
+    // the "working directory" where relative names are resolved
+    protected Class<? extends PropsConfiguration> getResourceWD() {
+        return this.getClass();
+    }
     private File getFile(final String name) {
         return new File(name.startsWith("/") ? name.substring(1) : name);
+    }
     private boolean mustUseClassloader(final File f) {
+    }
     public final String getResource(final String name) {
         final File f = getFile(name);
         if (mustUseClassloader(f)) {
-            return this.getClass().getResource(name).toExternalForm();
+            return this.getResourceWD().getResource(name).toExternalForm();
         } else {
             return f.getAbsolutePath();
+        }
+    }
     protected SQLElementDirectory createDirectory() {
         return new SQLElementDirectory();
+    }
-    // items will be passed to #getStream(String)
+    // Use resource name to be able to use absolute (beginning with /) or relative path (to this
+    // class)
     protected List<String> getMappings() {
         return Arrays.asList("mapping", "mapping-" + this.getProperty("customer"));
+    }
     protected SQLFieldTranslator createTranslator(final SQLElementDirectory dir) {
         final List<String> mappings = getMappings();
         if (mappings.size() == 0)
             throw new IllegalStateException("empty mappings");
-        final SQLFieldTranslator trns = new SQLFieldTranslator(this.getRoot(), null, dir);
+        final SQLFieldTranslator trns = new SQLFieldTranslator(this.getRoot(), dir);
         // perhaps listen to UserProps (as in TM)
         return loadTranslations(trns, this.getRoot(), mappings);
+    }
     protected final SQLFieldTranslator loadTranslations(final SQLFieldTranslator trns, final DBRoot root, final List<String> mappings) {
             final List<Locale> langs = cntrl.getCandidateLocales(fakeBaseName, targetLocale);
             // SQLFieldTranslator overwrite, so we need to load from general to specific
             final ListIterator<Locale> listIterator = CollectionUtils.getListIterator(langs, true);
             while (listIterator.hasNext()) {
                 final Locale lang = listIterator.next();
+                final SQLElementNamesFromXML elemNames = new SQLElementNamesFromXML(lang);
-                found |= loadTranslations(trns, PropsConfiguration.class.getResourceAsStream(cntrl.toBundleName("mapping", lang) + ".xml"), root);
+                found |= loadTranslations(trns, PropsConfiguration.class.getResourceAsStream(cntrl.toBundleName("mapping", lang) + ".xml"), root, elemNames);
                 for (final String m : mappings) {
+                    final String bundleName = cntrl.toBundleName(m, lang);
-                    found |= loadTranslations(trns, this.getStream(cntrl.toBundleName(m, lang) + ".xml"), root);
+                    found |= loadTranslations(trns, this.getStream(bundleName + ".xml"), root, elemNames);
+                    final Class<? extends TranslatorFiller> loadedClass = ReflectUtils.getSubclass(toClassName(bundleName), TranslatorFiller.class);
+                    if (loadedClass != null) {
+                        try {
+                            ReflectUtils.createInstance(loadedClass, this).fill(trns);
+                        } catch (Exception e) {
+                            Log.get().log(Level.WARNING, "Couldn't use " + loadedClass, e);
+                        }
+                    }
+                }
+            }
+        }
         return trns;
+    }
+    @FunctionalInterface
+    static public interface TranslatorFiller {
+        void fill(final SQLFieldTranslator t);
+    }
+    static public abstract class AbstractTranslatorFiller implements TranslatorFiller {
+        private final PropsConfiguration conf;
+        public AbstractTranslatorFiller(final PropsConfiguration conf) {
+            this.conf = conf;
+        }
+        protected final PropsConfiguration getConf() {
+            return this.conf;
+        }
+    }
-    private final boolean loadTranslations(final SQLFieldTranslator trns, final InputStream in, final DBRoot root) {
+    private final boolean loadTranslations(final SQLFieldTranslator trns, final InputStream in, final DBRoot root, final SQLElementNamesFromXML elemNames) {
         final boolean res = in != null;
         // do not force to have one mapping for each client and each locale
         if (res)
-            trns.load(root, in);
+            trns.load(root, in, elemNames);
         return res;
+    }
     protected File createWD() {
         return new File(this.getProperty("wd"));
             return this.filter;
+        }
+    }
     @Override
-    public final SQLFieldTranslator getTranslator() {
-        return this.getDirectory().getTranslator();
-    }
-    @Override
     public final SQLElementDirectory getDirectory() {
         return this.directory.get();
+    }
     public final ProductInfo getProductInfo() {

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/sql/PropsConfiguration.java - Rev 151 → 156