X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fparser%2Fwiktionary%2FWiktionaryLangs.java;h=01b31a23861e7f4c093fa4d101424503a22c8736;hb=2fc669d88306d563fc9c899d8d91b25d591692ea;hp=af7bf1803fda90a2a5a19f3aa406acc050621632;hpb=349d140dce670c45be4032d7c7286956a389a2b5;p=DictionaryPC.git

diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java b/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
index af7bf18..01b31a2 100644
--- a/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
+++ b/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
@@ -14,17 +14,13 @@
 
 package com.hughes.android.dictionary.parser.wiktionary;
 
-import com.hughes.android.dictionary.engine.Language;
-
 import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
 import java.util.Map;
-import java.util.Set;
 import java.util.regex.Pattern;
 
 public class WiktionaryLangs {
 
-    public static final Map<String,String> isoCodeToEnWikiName = new LinkedHashMap<String,String>();
+    public static final Map<String,String> isoCodeToEnWikiName = new LinkedHashMap<>();
     static {
         isoCodeToEnWikiName.put("AF", "Afrikaans");
         isoCodeToEnWikiName.put("SQ", "Albanian");
@@ -111,7 +107,6 @@ public class WiktionaryLangs {
         isoCodeToEnWikiName.put("HT", "Haitian Creole");
         isoCodeToEnWikiName.put("LB", "Luxembourgish");
         isoCodeToEnWikiName.put("MK", "Macedonian");
-        isoCodeToEnWikiName.put("GV", "Manx");
         isoCodeToEnWikiName.put("scn", "Sicilian");
         isoCodeToEnWikiName.put("cu", "Old Church Slavonic");
         isoCodeToEnWikiName.put("rom", "Romani");
@@ -133,15 +128,15 @@ public class WiktionaryLangs {
         //assert Language.isoCodeToResources.keySet().containsAll(isoCodeToEnWikiName.keySet());
     }
 
-    public static final Map<String,Map<String,String>> wikiCodeToIsoCodeToWikiName = new LinkedHashMap<String, Map<String,String>>();
+    public static final Map<String,Map<String,String>> wikiCodeToIsoCodeToWikiName = new LinkedHashMap<>();
     static {
+        Map<String,String> isoCodeToWikiName;
+
         // en
         wikiCodeToIsoCodeToWikiName.put("en", isoCodeToEnWikiName);
 
-        Map<String,String> isoCodeToWikiName;
-
         // egrep -o '\{\{Wortart[^}]+\}\}' dewiktionary-pages-articles.xml | cut -d \| -f3 | sort | uniq -c | sort -nr
-        isoCodeToWikiName = new LinkedHashMap<String, String>();
+        isoCodeToWikiName = new LinkedHashMap<>();
         wikiCodeToIsoCodeToWikiName.put("de", isoCodeToWikiName);
         isoCodeToWikiName.put("nds", "Niederdeutsch");
         isoCodeToWikiName.put("DE", "Deutsch");
@@ -159,7 +154,7 @@ public class WiktionaryLangs {
         isoCodeToWikiName.put("RO", "Rumänisch");
 
         // egrep -o '== *\{\{langue\|[a-zA-Z]+\}\} *==' frwiktionary-pages-articles.xml | sort | uniq -c | sort -nr
-        isoCodeToWikiName = new LinkedHashMap<String, String>();
+        isoCodeToWikiName = new LinkedHashMap<>();
         wikiCodeToIsoCodeToWikiName.put("fr", isoCodeToWikiName);
         isoCodeToWikiName.put("FR", Pattern.quote("{{langue|fr}}"));
         isoCodeToWikiName.put("RU", Pattern.quote("{{langue|ru}}"));
@@ -186,7 +181,7 @@ public class WiktionaryLangs {
         isoCodeToWikiName.put("PT", Pattern.quote("{{langue|pt}}"));
 
         // egrep -o '= *\{\{-[a-z]+-\}\} *=' itwiktionary-pages-articles.xml | sort | uniq -c | sort -n
-        isoCodeToWikiName = new LinkedHashMap<String, String>();
+        isoCodeToWikiName = new LinkedHashMap<>();
         wikiCodeToIsoCodeToWikiName.put("it", isoCodeToWikiName);
         isoCodeToWikiName.put("IT", "\\{\\{-(it|scn|nap|cal|lmo)-\\}\\}");  // scn, nap, cal, lmo
         isoCodeToWikiName.put("EN", Pattern.quote("{{-en-}}"));
@@ -204,7 +199,7 @@ public class WiktionaryLangs {
         isoCodeToWikiName.put("RU", Pattern.quote("{{-ru-}}"));
 
         // egrep -o '== *\{\{lengua\|[a-zA-Z]+\}\} *==' frwiktionary-pages-articles.xml | sort | uniq -c | sort -nr
-        isoCodeToWikiName = new LinkedHashMap<String, String>();
+        isoCodeToWikiName = new LinkedHashMap<>();
         wikiCodeToIsoCodeToWikiName.put("es", isoCodeToWikiName);
         isoCodeToWikiName.put("AR", Pattern.quote("{{lengua|ar}}"));
         isoCodeToWikiName.put("ES", Pattern.quote("{{lengua|es}}"));
@@ -213,7 +208,7 @@ public class WiktionaryLangs {
         isoCodeToWikiName.put("IT", Pattern.quote("{{lengua|it}}"));
 
         // Pattern seems to match Italian one
-        isoCodeToWikiName = new LinkedHashMap<String, String>();
+        isoCodeToWikiName = new LinkedHashMap<>();
         wikiCodeToIsoCodeToWikiName.put("pt", isoCodeToWikiName);
         isoCodeToWikiName.put("PT", Pattern.quote("{{-pt-}}"));
         isoCodeToWikiName.put("EN", Pattern.quote("{{-en-}}"));