/branches/v2_0_0_prep/libraries/libInternationalization/src/org/gvsig/i18n/Messages.java - Diff - Application: gvSIG desktop - gvSIG

Revision 28469 branches/v2_0_0_prep/libraries/libInternationalization/src/org/gvsig/i18n/Messages.java

     import java.text.MessageFormat;
     import java.util.ArrayList;
     import java.util.Enumeration;
     import java.util.HashSet;
     import java.util.IllegalFormatException;
     import java.util.Iterator;
     import java.util.Locale;
-...
         private static ArrayList localeResources = new ArrayList();
     	private static ArrayList preferredLocales = new ArrayList(); // contains the ordered list of prefered languages/locales (class Locale)
     	/* Set of resource families and classloaders used to load i18n resources. */
     	private static Set resourceFamilies = new HashSet();
     	private static Set classLoaders = new HashSet();
     	/*
     	 * The language considered the origin of translations, which will
     	 * (possibly) be stored in a property file without language suffix
     	 * (ie: text.properties instead of text_es.properties).
     	 */
     	private static String baseLanguage = "es";
     	private static Locale baseLocale = new Locale(baseLanguage);
     	/**
     	 * <p>Gets the localized message associated with the provided key.
-...
     	 *                    is null, return null.
     	 */
     	public static String getText(String key, String callerName) {
     		if (key==null) return null;
     		if (key==null) {
     			return null;
+    		}
     		for (int numLocale=0; numLocale<localeResources.size(); numLocale++) {
     			// try to get the translation for any of the languagues in the preferred languages list
     			String translation = ((Properties)localeResources.get(numLocale)).getProperty(key);
     			if (translation!=null && !translation.equals(""))
     			if (translation!=null && !translation.equals("")) {
     				return translation;
+    			}
+    		}
     		logger.warn(callerName+ " -- Cannot find translation for "+key);
     		return key;
-...
     	 *                    or null if the key is not in the dictionary.
     	 */
     	public static String getText(String key, String callerName, boolean log) {
     		if (key==null) return null;
     		if (key==null) {
     			return null;
+    		}
     		for (int numLocale=0; numLocale<localeResources.size(); numLocale++) {
     			// try to get the translation for any of the languagues in the preferred languages list
     			String translation = ((Properties)localeResources.get(numLocale)).getProperty(key);
     			if (translation!=null && !translation.equals(""))
     			if (translation!=null && !translation.equals("")) {
     				return translation;
+    			}
+    		}
     		if (log) {
     			logger.warn(callerName+" -- Cannot find translation for "+key);
-...
     	public static void addResourceFamily(String family, ClassLoader loader, String callerName) {
     		String currentKey;
     		Enumeration keys;
     		String lang;
     		Locale lang;
     		Properties properties, translations;
     		int totalLocales = preferredLocales.size();
-...
     			logger.warn("There is not preferred languages list. Maybe the Messages class was not initialized");
+    		}
     		resourceFamilies.add(family);
     		classLoaders.add(loader);
     		for (int numLocale=0; numLocale<totalLocales; numLocale++) { // for each language
     			properties =  new Properties();
     			lang = ((Locale) preferredLocales.get(numLocale)).getLanguage();
     			InputStream is = loader.getResourceAsStream(family.replace('.','/')+"_"+lang+".properties");
     			lang = (Locale) preferredLocales.get(numLocale);
     			translations = (Properties) localeResources.get(numLocale);
     			addResourceFamily(lang, translations, family, loader, callerName);
+    		}
+    	}
     	private static void addResourceFamily(Locale lang, Properties translations,
     			String family, ClassLoader loader, String callerName) {
     		Properties properties = new Properties();
     		String resource = family.replace('.', '/') + "_" + lang.toString()
     				+ ".properties";
     		InputStream is = loader.getResourceAsStream(resource);
     		if (is != null) {
     			try {
     				properties.load(is);
     			} catch (IOException e) {
+    			}
     		} else if (lang.equals(baseLocale)) {
     			// try also "text.properties" for the base language
     			is = loader.getResourceAsStream(family.replace('.', '/')
     					+ ".properties");
     			if (is != null) {
     				try {
     					properties.load(is);
     				} catch (IOException e) {
+    				}
+    			}
     			else if (lang.equals(baseLanguage)) {
     				// try also "text.properties" for the base language
     				is = loader.getResourceAsStream(family.replace('.','/')+".properties");
     				if (is!=null) {
     					try {
     						properties.load(is);
     					} catch (IOException e) {
+    					}
+    				}
+    			}
     			translations = (Properties)localeResources.get(numLocale);
     			keys = properties.keys();
     			while (keys.hasMoreElements()) {
     				currentKey = (String) keys.nextElement();
     				if (! translations.containsKey(currentKey)) {
     					translations.put(currentKey, properties.getProperty(currentKey));
+    				}
+    		}
     		Enumeration keys = properties.keys();
     		while (keys.hasMoreElements()) {
     			String currentKey = (String) keys.nextElement();
     			if (!translations.containsKey(currentKey)) {
     				translations
     						.put(currentKey, properties.getProperty(currentKey));
+    			}
+    		}
+    	}
     	/**
-...
     		int numLocale = preferredLocales.indexOf(lang);
     		if (numLocale!=-1) {
     			return ((Properties)localeResources.get(numLocale)).keySet();
     		} else {
     			return null;
+    		}
     		else
     			return null;
+    	}
     	/**
-...
     	 */
     	public static void setBaseLanguage(String lang) {
     		baseLanguage = lang;
     		baseLocale = new Locale(baseLanguage);
+    	}
     	/*
-...
+    		}
     		return availableLanguages;
     	}*/
     	public static Properties getAllTexts(Locale lang) {
     		Properties texts = new Properties();
     		getAllTexts(lang, null, texts);
     		for (Iterator iterator = classLoaders.iterator(); iterator.hasNext();) {
     			getAllTexts(lang, (ClassLoader) iterator.next(), texts);
+    		}
     		return texts;
+    	}
     	private static void getAllTexts(Locale lang, ClassLoader classLoader,
     			Properties texts) {
     		ClassLoader loader = classLoader == null ? Messages.class
     				.getClassLoader() : classLoader;
     		for (Iterator iterator = resourceFamilies.iterator(); iterator
     				.hasNext();) {
     			String family = (String) iterator.next();
     			addResourceFamily(lang, texts, family, loader,
     					"Messages.getAllTexts");
+    		}
+    	}
+    }

Also available in: Unified diff