Update nikiroo-utils to 4.2.0 + remove warnings

diff --git a/changelog.md b/changelog.md
index cf94f344ebcde2434c08bec92af887534ce76677..abe445ff0cbd5e5128e5f2161c2fc342384b6ef7 100644 (file)
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,6 @@
 # Fanfix
 
-# Version 1.6.4
+# Version WIP
 
 - update nikiroo-utils
 - android: Android compatibility

diff --git a/libs/nikiroo-utils-4.0.1-sources.jar b/libs/nikiroo-utils-4.2.0-sources.jar
similarity index 76%
rename from libs/nikiroo-utils-4.0.1-sources.jar
rename to libs/nikiroo-utils-4.2.0-sources.jar
index 6618209437dc12c91b70c46ca19d5b954d2925f3..2dd080fc2f3c853f2fde2e9c417251bb1dcccf36 100644 (file)
Binary files a/libs/nikiroo-utils-4.0.1-sources.jar and b/libs/nikiroo-utils-4.2.0-sources.jar differ

diff --git a/src/be/nikiroo/fanfix/VersionCheck.java b/src/be/nikiroo/fanfix/VersionCheck.java
index 00450623cb3dea5603c77ae076eac2c9c8b7f0e9..76758af85ca3daaa5ef4f5b8e5fcc799bbee6f2e 100644 (file)
--- a/src/be/nikiroo/fanfix/VersionCheck.java
+++ b/src/be/nikiroo/fanfix/VersionCheck.java
@@ -110,7 +110,7 @@ public class VersionCheck {
                if (Instance.isVersionCheckNeeded()) {
                        try {
                                // Prepare the URLs according to the user's language
-                               Locale lang = Instance.getTrans().getLanguage();
+                               Locale lang = Instance.getTrans().getLocale();
                                String fr = lang.getLanguage();
                                String BE = lang.getCountry().replace(".UTF8", "");
                                String urlFrBE = base.replace("${LANG}", "-" + fr + "_" + BE);

diff --git a/src/be/nikiroo/fanfix/bundles/StringIdBundle.java b/src/be/nikiroo/fanfix/bundles/StringIdBundle.java
index 0b129e49eedbbb50640ed64e2625ac584671e1ea..e94c05b448eb3ba3231035f9999ec4dbb22d40b7 100644 (file)
--- a/src/be/nikiroo/fanfix/bundles/StringIdBundle.java
+++ b/src/be/nikiroo/fanfix/bundles/StringIdBundle.java
@@ -2,7 +2,6 @@ package be.nikiroo.fanfix.bundles;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Locale;
 
 import be.nikiroo.utils.resources.TransBundle;
 
@@ -12,8 +11,6 @@ import be.nikiroo.utils.resources.TransBundle;
  * @author niki
  */
 public class StringIdBundle extends TransBundle<StringId> {
-       private String lang;
-
        /**
         * Create a translation service for the given language (will fall back to
         * the default one i not found).
@@ -23,18 +20,6 @@ public class StringIdBundle extends TransBundle<StringId> {
         */
        public StringIdBundle(String lang) {
                super(StringId.class, Target.resources, lang);
-               this.lang = lang;
-       }
-
-       /**
-        * Return the currently used language as a String.
-        * 
-        * @return the language
-        * 
-        * @deprecated use the call from {@link TransBundle} when available
-        */
-       public Locale getLanguage() {
-               return getLocaleFor(lang);
        }
 
        /**
@@ -52,39 +37,4 @@ public class StringIdBundle extends TransBundle<StringId> {
                new StringIdBundle(null).updateFile(path);
                System.out.println("Path updated: " + path);
        }
-
-       /**
-        * Return the {@link Locale} representing the given language.
-        * 
-        * @param language
-        *            the language to initialise, in the form "en-GB" or "fr" for
-        *            instance
-        * 
-        * @return the corresponding {@link Locale} or the default {@link Locale} if
-        *         it is not known
-        * 
-        * @deprecated Use the call from {@link TransBundle} when available.
-        */
-       static private Locale getLocaleFor(String language) {
-               Locale locale;
-
-               if (language == null) {
-                       locale = Locale.getDefault();
-               } else {
-                       language = language.replaceAll("_", "-");
-                       String lang = language;
-                       String country = null;
-                       if (language.contains("-")) {
-                               lang = language.split("-")[0];
-                               country = language.split("-")[1];
-                       }
-
-                       if (country != null)
-                               locale = new Locale(lang, country);
-                       else
-                               locale = new Locale(lang);
-               }
-
-               return locale;
-       }
 }

diff --git a/src/be/nikiroo/fanfix/supported/Text.java b/src/be/nikiroo/fanfix/supported/Text.java
index 14379113f69aee0cee80b6aa95e5474821180344..25d7899a61ef1caf7f042053499b28dc87530fa3 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/Text.java
+++ b/src/be/nikiroo/fanfix/supported/Text.java
@@ -28,7 +28,7 @@ import be.nikiroo.utils.Progress;
  * number</li>
  * <li>A description of the story must be given as chapter number 0</li>
  * <li>A cover may be present, with the same filename but a PNG, JPEG or JPG
- * extension</li<
+ * extension</li>
  * </ul>
  * 
  * @author niki