Minor automated code simplifications.

[DictionaryPC.git] / src / com / hughes / android / dictionary / parser / wiktionary / FrFunctionCallbacks.java

diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/FrFunctionCallbacks.java b/src/com/hughes/android/dictionary/parser/wiktionary/FrFunctionCallbacks.java
index 7727ad0e1f4f41b5065b89606fcb0afda51bec74..9f4ef05127817b77530663057057af4fb25619a2 100644 (file)
--- a/src/com/hughes/android/dictionary/parser/wiktionary/FrFunctionCallbacks.java
+++ b/src/com/hughes/android/dictionary/parser/wiktionary/FrFunctionCallbacks.java
@@ -14,59 +14,59 @@
 
 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("-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"));
+    static <T extends AbstractWiktionaryParser> void addGenericCallbacks(Map<String, FunctionCallback<T>> callbacks) {
+        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("-trad-", new ItFunctionCallbacks.SkipSection<T>());
-  }
+        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"));
 
-  
-  static final NameAndArgs<EnParser> NAME_AND_ARGS = new NameAndArgs<EnParser>();
-
-  
-  static final class MakeHeadingFromName<T extends AbstractWiktionaryParser> implements FunctionCallback<T> {
-    final String header;
-    public MakeHeadingFromName(String header) {
-        this.header = header;
+        callbacks.put("-trad-", new ItFunctionCallbacks.SkipSection<>());
     }
 
-    @Override
-      public boolean onWikiFunction(final WikiTokenizer wikiTokenizer, final String name, final List<String> args,
-          final Map<String, String> namedArgs,
-          final T parser,
-          final AppendAndIndexWikiCallback<T> appendAndIndexWikiCallback) {
-        if (!namedArgs.isEmpty() || args.size() != 0) {
-            return false;
+
+    static final NameAndArgs<EnParser> NAME_AND_ARGS = new NameAndArgs<>();
+
+
+    static final class MakeHeadingFromName<T extends AbstractWiktionaryParser> implements FunctionCallback<T> {
+        final String header;
+        public MakeHeadingFromName(String header) {
+            this.header = header;
+        }
+
+        @Override
+        public boolean onWikiFunction(final WikiTokenizer wikiTokenizer, final String name, final List<String> args,
+                                      final Map<String, String> namedArgs,
+                                      final T parser,
+                                      final AppendAndIndexWikiCallback<T> appendAndIndexWikiCallback) {
+            if (!namedArgs.isEmpty() || args.size() != 0) {
+                return false;
+            }
+            //appendAndIndexWikiCallback.builder.append(String.format("<%s>", header));
+            appendAndIndexWikiCallback.dispatch("\n" + header + name + header, null);
+            //appendAndIndexWikiCallback.builder.append(String.format("</%s>\n", header));
+            return true;
         }
-        //appendAndIndexWikiCallback.builder.append(String.format("<%s>", header));
-        appendAndIndexWikiCallback.dispatch("\n" + header + name + header, null);
-        //appendAndIndexWikiCallback.builder.append(String.format("</%s>\n", header));
-        return true;
-      }
     }