Minor automated code simplifications.

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

diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/DeFunctionCallbacks.java b/src/com/hughes/android/dictionary/parser/wiktionary/DeFunctionCallbacks.java
index 6fcac4a332717b01bacd09bcbf0363aa87161273..fd6ea725c3f21cc49bd7dcf5266efd029b9630bf 100644 (file)
--- a/src/com/hughes/android/dictionary/parser/wiktionary/DeFunctionCallbacks.java
+++ b/src/com/hughes/android/dictionary/parser/wiktionary/DeFunctionCallbacks.java
@@ -14,58 +14,64 @@
 
 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 java.util.List;
-import java.util.Map;
-
 class DeFunctionCallbacks {
-  
-  static <T extends AbstractWiktionaryParser> void addGenericCallbacks(Map<String, FunctionCallback<T>> callbacks) {
-      FunctionCallback<T> callback = new MakeHeadingFromName<T>("====");
-      callbacks.put("Aussprache", callback);
-      callbacks.put("Worttrennung", callback);
-      callbacks.put("Bedeutungen", callback);
-      callbacks.put("Herkunft", callback);
-      callbacks.put("Synonyme", callback);
-      callbacks.put("Gegenwörter", callback);
-      callbacks.put("Verkleinerungsformen", callback);
-      callbacks.put("Oberbegriffe", callback);
-      callbacks.put("Unterbegriffe", callback);
-      callbacks.put("Beispiele", callback);
-      callbacks.put("Redewendungen", callback);
-      callbacks.put("Charakteristische Wortkombinationen", callback);
-      callbacks.put("Abgeleitete Begriffe", callback);
-      callbacks.put("Übersetzungen", callback);
-      callbacks.put("Referenzen", callback);
-      callbacks.put("Grammatische Merkmale", callback);
-  }
 
-  
-  static final NameAndArgs<EnParser> NAME_AND_ARGS = new NameAndArgs<EnParser>();
+    static <T extends AbstractWiktionaryParser> void addGenericCallbacks(Map<String, FunctionCallback<T>> callbacks) {
+        FunctionCallback<T> callback = new MakeHeadingFromName<>("====");
+        callbacks.put("Aussprache", callback);
+        callbacks.put("Worttrennung", callback);
+        callbacks.put("Bedeutungen", callback);
+        callbacks.put("Herkunft", callback);
+        callbacks.put("Synonyme", callback);
+        callbacks.put("Gegenwörter", callback);
+        callbacks.put("Verkleinerungsformen", callback);
+        callbacks.put("Oberbegriffe", callback);
+        callbacks.put("Unterbegriffe", callback);
+        callbacks.put("Beispiele", callback);
+        callbacks.put("Redewendungen", callback);
+        callbacks.put("Charakteristische Wortkombinationen", callback);
+        callbacks.put("Abgeleitete Begriffe", callback);
+        callbacks.put("Übersetzungen", callback);
+        callbacks.put("Referenzen", callback);
+        callbacks.put("Grammatische Merkmale", callback);
+        callbacks.put("Abkürzungen", callback);
 
-  
-  static final class MakeHeadingFromName<T extends AbstractWiktionaryParser> implements FunctionCallback<T> {
-    final String header;
-    public MakeHeadingFromName(String header) {
-        this.header = header;
+        // TODO:
+        // {{Anmerkung}}
+        // {{Anmerkungen}}
+        // {{Anmerkung|zum Gebrauch}}
     }
 
-    @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;
-      }
     }