X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fparser%2Fwiktionary%2FFrFunctionCallbacks.java;h=9f4ef05127817b77530663057057af4fb25619a2;hb=2fc669d88306d563fc9c899d8d91b25d591692ea;hp=2edf3acf0fedc9d424546e5d62944a748421e3d3;hpb=e479ba38bbcb261951399326623c20ffacc147d4;p=DictionaryPC.git

diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/FrFunctionCallbacks.java b/src/com/hughes/android/dictionary/parser/wiktionary/FrFunctionCallbacks.java
index 2edf3ac..9f4ef05 100644
--- a/src/com/hughes/android/dictionary/parser/wiktionary/FrFunctionCallbacks.java
+++ b/src/com/hughes/android/dictionary/parser/wiktionary/FrFunctionCallbacks.java
@@ -14,38 +14,38 @@
 
 package com.hughes.android.dictionary.parser.wiktionary;
 
+import java.util.List;
+import java.util.Map;
+
 import com.hughes.android.dictionary.parser.WikiTokenizer;
 import com.hughes.android.dictionary.parser.wiktionary.AbstractWiktionaryParser.AppendAndIndexWikiCallback;
 import com.hughes.android.dictionary.parser.wiktionary.AbstractWiktionaryParser.NameAndArgs;
 import com.hughes.android.dictionary.parser.wiktionary.ItFunctionCallbacks.Redispatch;
 
-import java.util.List;
-import java.util.Map;
-
 class FrFunctionCallbacks {
 
     static <T extends AbstractWiktionaryParser> void addGenericCallbacks(Map<String, FunctionCallback<T>> callbacks) {
-        callbacks.put("-étym-", new Redispatch<T>("\n==== Étymologie ====\n"));
-        callbacks.put("-pron-", new Redispatch<T>("\n==== Prononciation ====\n"));
-        callbacks.put("-voir-", new Redispatch<T>("\n==== Voir aussi ====\n"));
-        callbacks.put("-drv-", new Redispatch<T>("\n==== Dérivés ====\n"));
-        callbacks.put("-syn-", new Redispatch<T>("\n==== Synonymes ====\n"));
+        callbacks.put("-étym-", new Redispatch<>("\n==== Étymologie ====\n"));
+        callbacks.put("-pron-", new Redispatch<>("\n==== Prononciation ====\n"));
+        callbacks.put("-voir-", new Redispatch<>("\n==== Voir aussi ====\n"));
+        callbacks.put("-drv-", new Redispatch<>("\n==== Dérivés ====\n"));
+        callbacks.put("-syn-", new Redispatch<>("\n==== Synonymes ====\n"));
 
-        callbacks.put("-apr-", new Redispatch<T>("\n==== Apparentés étymologiques ====\n"));
-        callbacks.put("-hyper-", new Redispatch<T>("\n==== Hyperonymes ====\n"));
-        callbacks.put("-hypo-", new Redispatch<T>("\n==== Hyponymes ====\n"));
-        callbacks.put("-réf-", new Redispatch<T>("\n==== Références ====\n"));
-        callbacks.put("-homo-", new Redispatch<T>("\n==== Homophones ====\n"));
-        callbacks.put("-anagr-", new Redispatch<T>("\n==== Anagrammes ====\n"));
-        callbacks.put("-voc-", new Redispatch<T>("\n==== Vocabulaire apparenté par le sens ====\n"));
-        callbacks.put("-exp-", new Redispatch<T>("\n==== Expressions ====\n"));
-        callbacks.put("-note-", new Redispatch<T>("\n==== Note ====\n"));
+        callbacks.put("-apr-", new Redispatch<>("\n==== Apparentés étymologiques ====\n"));
+        callbacks.put("-hyper-", new Redispatch<>("\n==== Hyperonymes ====\n"));
+        callbacks.put("-hypo-", new Redispatch<>("\n==== Hyponymes ====\n"));
+        callbacks.put("-réf-", new Redispatch<>("\n==== Références ====\n"));
+        callbacks.put("-homo-", new Redispatch<>("\n==== Homophones ====\n"));
+        callbacks.put("-anagr-", new Redispatch<>("\n==== Anagrammes ====\n"));
+        callbacks.put("-voc-", new Redispatch<>("\n==== Vocabulaire apparenté par le sens ====\n"));
+        callbacks.put("-exp-", new Redispatch<>("\n==== Expressions ====\n"));
+        callbacks.put("-note-", new Redispatch<>("\n==== Note ====\n"));
 
-        callbacks.put("-trad-", new ItFunctionCallbacks.SkipSection<T>());
+        callbacks.put("-trad-", new ItFunctionCallbacks.SkipSection<>());
     }
 
 
-    static final NameAndArgs<EnParser> NAME_AND_ARGS = new NameAndArgs<EnParser>();
+    static final NameAndArgs<EnParser> NAME_AND_ARGS = new NameAndArgs<>();
 
 
     static final class MakeHeadingFromName<T extends AbstractWiktionaryParser> implements FunctionCallback<T> {