Resources: now allow "--config" and external .properties files

[jvcard.git] / src / be / nikiroo / jvcard / resources / FixedResourceBundleControl.java

diff --git a/src/be/nikiroo/jvcard/resources/FixedResourceBundleControl.java b/src/be/nikiroo/jvcard/resources/FixedResourceBundleControl.java
index e67ace1c485c2d347df069ea6b231cfb5d28cca9..ca3114e4ccf6014ab7a6e7d83e3f304839a8a4f6 100644 (file)
--- a/src/be/nikiroo/jvcard/resources/FixedResourceBundleControl.java
+++ b/src/be/nikiroo/jvcard/resources/FixedResourceBundleControl.java
@@ -1,5 +1,7 @@
 package be.nikiroo.jvcard.resources;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -13,16 +15,33 @@ import java.util.ResourceBundle.Control;
 /**
  * Fixed ResourceBundle.Control class. It will use UTF-8 for the files to load.
  * 
+ * Also support an option to first check into the given path before looking into
+ * the resources.
+ * 
  * @author niki
  *
  */
 class FixedResourceBundleControl extends Control {
+       private String outsideWorld = null;
+
+       /**
+        * Create a new {@link FixedResourceBundleControl}.
+        * 
+        * @param outsideWorld
+        *            NULL if you are only interested into the resources, a path to
+        *            first check into it before looking at the actual resources
+        */
+       public FixedResourceBundleControl(String outsideWorld) {
+               this.outsideWorld = outsideWorld;
+       }
+
        public ResourceBundle newBundle(String baseName, Locale locale,
                        String format, ClassLoader loader, boolean reload)
                        throws IllegalAccessException, InstantiationException, IOException {
                // The below is a copy of the default implementation.
                String bundleName = toBundleName(baseName, locale);
                String resourceName = toResourceName(bundleName, "properties");
+
                ResourceBundle bundle = null;
                InputStream stream = null;
                if (reload) {
@@ -35,11 +54,31 @@ class FixedResourceBundleControl extends Control {
                                }
                        }
                } else {
-                       stream = loader.getResourceAsStream(resourceName);
+                       // New code to support outside resources:
+                       if (outsideWorld != null) {
+                               String pkg = this.getClass().getPackage().getName()
+                                               .replaceAll("\\.", File.separator)
+                                               + File.separator;
+
+                               if (resourceName.startsWith(pkg)) {
+                                       try {
+                                               String file = outsideWorld + File.separator
+                                                               + resourceName.substring(pkg.length());
+                                               stream = new FileInputStream(file);
+                                       } catch (Exception e) {
+                                               // file not in priority directory,
+                                               // fallback to default resource
+                                       }
+                               }
+                       }
+
+                       if (stream == null)
+                               stream = loader.getResourceAsStream(resourceName);
+                       //
                }
                if (stream != null) {
                        try {
-                               // Only this line is changed to make it to read properties files
+                               // This line is changed to make it to read properties files
                                // as UTF-8.
                                // How can someone use an archaic encoding such as ISO 8859-1 by
                                // *DEFAULT* is beyond me...