X-Git-Url: http://gitweb.fperrin.net/?p=DictionaryPC.git;a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fparser%2Fwiktionary%2FWiktionaryLangs.java;h=fb9f283f52c2668285d3f5a1030f648319f65d0f;hp=86206a060bbbc68f09c4314c16ba1eeae6f245e9;hb=96e85ff86f44888a9994710d55e760893d87da76;hpb=cb48e386855b695b54c6e9682ef7bffaf1d2ba38

diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java b/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
index 86206a0..fb9f283 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,7 +128,7 @@ 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;
 
@@ -141,7 +136,7 @@ public class WiktionaryLangs {
         wikiCodeToIsoCodeToWikiName.put("en", isoCodeToEnWikiName);
 
         // 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}}"));
@@ -187,7 +182,7 @@ public class WiktionaryLangs {
         isoCodeToWikiName.put("SV", Pattern.quote("{{langue|sv}}"));
 
         // 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-}}"));
@@ -205,7 +200,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}}"));
@@ -214,7 +209,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-}}"));