Adding optional fallback to root language bundle

cal10n-api/src/main/java/ch/qos/cal10n/Settings.java

@@ -0,0 +1,16 @@
+package ch.qos.cal10n;
+
+public class Settings
+{
+    private static boolean rootLanguageFallbackEnabled = false;
+
+    public static void setRootLanguageFallbackEnabled(boolean enabled)
+    {
+        rootLanguageFallbackEnabled = enabled;
+    }
+
+    public static boolean isRootLanguageFallbackEnabled()
+    {
+        return rootLanguageFallbackEnabled ;
+    }
+}

cal10n-api/src/main/java/ch/qos/cal10n/util/AbstractCAL10NBundleFinder.java

@@ -6,11 +6,13 @@
 import java.net.URLConnection;
 import java.util.Locale;
 
+import ch.qos.cal10n.Settings;
+
 /**
  *  @since 0.8.1
  */
 public abstract class AbstractCAL10NBundleFinder implements CAL10NBundleFinder {
-
+   
   public CAL10NBundle getBundle(String baseName, Locale locale, String charset) {
 
     // same as the JDK convention
@@ -25,19 +27,36 @@ public CAL10NBundle getBundle(String baseName, Locale locale, String charset) {
             baseName, locale);
     String languageOnlyCandidate = computeLanguageOnlyCandidate(baseName,
             locale);
+    String noLanguageCandidate = computeNoLanguageCandidate(baseName);
+
+    final boolean rootLanguageFallbackEnabled = Settings.isRootLanguageFallbackEnabled();
+    CAL10NBundle cprbNoLanguage = null;
+    if (rootLanguageFallbackEnabled) {
+        cprbNoLanguage = makePropertyResourceBundle(noLanguageCandidate, charset);
+    }
 
     CAL10NBundle cprbLanguageOnly = makePropertyResourceBundle(languageOnlyCandidate, charset);
     CAL10NBundle cprbLanguageAndCountry = null;
 
     if (languageAndCountryCandidate != null) {
       cprbLanguageAndCountry = makePropertyResourceBundle(languageAndCountryCandidate, charset);
     }
+
+    if (rootLanguageFallbackEnabled && cprbNoLanguage != null && cprbLanguageOnly != null) {
+        cprbLanguageOnly.setParent(cprbNoLanguage);
+    }
 
     if (cprbLanguageAndCountry != null) {
-      cprbLanguageAndCountry.setParent(cprbLanguageOnly);
+      if (cprbLanguageOnly != null) {
+        cprbLanguageAndCountry.setParent(cprbLanguageOnly);
+      } else if (rootLanguageFallbackEnabled && cprbNoLanguage != null) {
+        cprbLanguageAndCountry.setParent(cprbNoLanguage);
+      }
       return cprbLanguageAndCountry;
+    } else if (cprbLanguageOnly != null) {
+      return cprbLanguageOnly;
     }
-    return cprbLanguageOnly;
+    return cprbNoLanguage;
   }
 
   private String computeLanguageAndCountryCandidate(String baseName,
@@ -81,6 +100,10 @@ private String computeLanguageOnlyCandidate(String baseName,
     return baseName + "_" + language + ".properties";
   }
 
+  private String computeNoLanguageCandidate(String baseName) {
+    return baseName +  ".properties";
+  }
+
   Reader toReader(InputStream in, String charset) {
     if (charset == null || charset.length() == 0)
       return new InputStreamReader(in);

cal10n-api/src/main/java/ch/qos/cal10n/util/CAL10NBundle.java

@@ -89,12 +89,22 @@ public void resetCheckTimes() {
     nextCheck = 0;
     lastModified = 0;
   } 
+
+  protected Map<String, String> getMap() {
+    if(parent == null) {
+      return this.map;
+    } else {
+      Hashtable<String, String> ht = new Hashtable<String, String>(map);
+      ht.putAll(parent.getMap());
+      return ht;
+    }
+  }
 
   @Override
   public Enumeration<String> getKeys() {
     Hashtable<String, String> ht = new Hashtable<String, String>(map);
     if(parent != null) {
-      ht.putAll(parent.map);
+      ht.putAll(parent.getMap());
     }
     return ht.keys();
   }

cal10n-api/src/main/java/ch/qos/cal10n/verifier/AbstractMessageKeyVerifier.java

@@ -1,13 +1,15 @@
 package ch.qos.cal10n.verifier;
 
+import ch.qos.cal10n.Settings;
+import ch.qos.cal10n.util.AbstractCAL10NBundleFinder;
 import ch.qos.cal10n.util.AnnotationExtractor;
 import ch.qos.cal10n.util.CAL10NBundleFinder;
 import ch.qos.cal10n.util.MiscUtil;
-
 import static ch.qos.cal10n.verifier.Cal10nError.ErrorType.MISSING_LOCALE_DATA_ANNOTATION;
 import static ch.qos.cal10n.verifier.Cal10nError.ErrorType.MISSING_BN_ANNOTATION;
 
 
+
 import java.util.*;
 
 /**
@@ -140,6 +142,12 @@ public List<Cal10nError> verifyAllLocales() {
       return errorList;
     }
     for (String localeName : localeNameArray) {
+      if ("".equals(localeName)) {
+        Settings.setRootLanguageFallbackEnabled(true);
+      } else {
+        //false is the default, but we might want to 'unset' it if the previous iteration of this loop set it to true.
+        Settings.setRootLanguageFallbackEnabled(false);
+      }
       Locale locale = MiscUtil.toLocale(localeName);
       List<Cal10nError> tmpList = verify(locale);
       errorList.addAll(tmpList);