X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fresources%2FTransBundle.java;h=51e090f6fab208f7bb6eb3f40fcb3910fe5c7901;hb=db31c35860081535d6e7ddc83ab4af573bb0522e;hp=125075a8bbd8268ca6c2310f2e3b40387132e2ac;hpb=e9ca6bb892b5358a273807bff834945ffe7b0cee;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/resources/TransBundle.java b/src/be/nikiroo/utils/resources/TransBundle.java
index 125075a..51e090f 100644
--- a/src/be/nikiroo/utils/resources/TransBundle.java
+++ b/src/be/nikiroo/utils/resources/TransBundle.java
@@ -17,6 +17,9 @@ import java.util.regex.Pattern;
  * <li>DUMMY will return "[DUMMY]" (maybe with a suffix and/or "NOUTF")</li>
  * </ul>
  * 
+ * @param <E>
+ *            the enum to use to get values out of this class
+ * 
  * @author niki
  */
 public class TransBundle<E extends Enum<E>> extends Bundle<E> {
@@ -33,7 +36,7 @@ public class TransBundle<E extends Enum<E>> extends Bundle<E> {
 	 *            the name of the {@link Bundles}
 	 */
 	public TransBundle(Class<E> type, Enum<?> name) {
-		super(type, name);
+		super(type, name, null);
 		setLanguage(null);
 	}
 
@@ -49,7 +52,7 @@ public class TransBundle<E extends Enum<E>> extends Bundle<E> {
 	 *            the language to use
 	 */
 	public TransBundle(Class<E> type, Enum<?> name, String language) {
-		super(type, name);
+		super(type, name, null);
 		setLanguage(language);
 	}
 
@@ -156,7 +159,7 @@ public class TransBundle<E extends Enum<E>> extends Bundle<E> {
 	 * @return the known language codes
 	 */
 	public List<String> getKnownLanguages() {
-		return getKnownLanguages(name);
+		return getKnownLanguages(keyType);
 	}
 
 	/**
@@ -169,12 +172,12 @@ public class TransBundle<E extends Enum<E>> extends Bundle<E> {
 	private void setLanguage(String language) {
 		defaultLocale = (language == null || language.length() == 0);
 		locale = getLocaleFor(language);
-		setBundle(name, locale, false);
+		setBundle(keyType, locale, false);
 	}
 
 	@Override
 	public void reload(boolean resetToDefault) {
-		setBundle(name, locale, resetToDefault);
+		setBundle(keyType, locale, resetToDefault);
 	}
 
 	@Override
@@ -197,26 +200,26 @@ public class TransBundle<E extends Enum<E>> extends Bundle<E> {
 	@Override
 	public void updateFile(String path) throws IOException {
 		String prev = locale.getLanguage();
-		Object status = takeChangesSnapshot();
+		Object status = takeSnapshot();
 
 		// default locale
 		setLanguage(null);
 		if (prev.equals(getLocaleFor(null).getLanguage())) {
 			// restore snapshot if default locale = current locale
-			restoreChanges(status);
+			restoreSnapshot(status);
 		}
 		super.updateFile(path);
 
 		for (String lang : getKnownLanguages()) {
 			setLanguage(lang);
 			if (lang.equals(prev)) {
-				restoreChanges(status);
+				restoreSnapshot(status);
 			}
 			super.updateFile(path);
 		}
 
 		setLanguage(prev);
-		restoreChanges(status);
+		restoreSnapshot(status);
 	}
 
 	@Override
@@ -224,10 +227,10 @@ public class TransBundle<E extends Enum<E>> extends Bundle<E> {
 		String code = locale.toString();
 		File file = null;
 		if (!defaultLocale && code.length() > 0) {
-			file = new File(path, name.name() + "_" + code + ".properties");
+			file = new File(path, keyType.name() + "_" + code + ".properties");
 		} else {
 			// Default properties file:
-			file = new File(path, name.name() + ".properties");
+			file = new File(path, keyType.name() + ".properties");
 		}
 
 		return file;