Changed ordering of FormOf, handling of FormOf, handing of Encoding.

[DictionaryPC.git] / src / com / hughes / android / dictionary / parser / enwiktionary / AppendAndIndexWikiCallback.java

diff --git a/src/com/hughes/android/dictionary/parser/enwiktionary/AppendAndIndexWikiCallback.java b/src/com/hughes/android/dictionary/parser/enwiktionary/AppendAndIndexWikiCallback.java
index 78c0fb3df19432459c323c3b004bd1c185215461..82e345ce41b6cf9fa1c774638d7da33136c87196 100644 (file)
--- a/src/com/hughes/android/dictionary/parser/enwiktionary/AppendAndIndexWikiCallback.java
+++ b/src/com/hughes/android/dictionary/parser/enwiktionary/AppendAndIndexWikiCallback.java
@@ -114,17 +114,6 @@ final class AppendAndIndexWikiCallback implements WikiTokenizer.Callback {
       final Map<String, String> namedArgs) {
     
     FunctionCallback functionCallback = functionCallbacks.get(name);
-    if (functionCallback == null) {
-      if (
-          name.equals("form of") || // TODO: switch to contains
-          name.contains("conjugation of") || 
-          name.contains("participle of") || 
-          name.contains("gerund of") || 
-          name.contains("feminine of") || 
-          name.contains("plural of")) {
-        functionCallback = functionCallbacks.get("form of");
-      }
-    }
     if (functionCallback == null || !functionCallback.onWikiFunction(wikiTokenizer, name, args, namedArgs, parser, this)) {
       // Default function handling:
       namedArgs.keySet().removeAll(EnWiktionaryXmlParser.USELESS_WIKI_ARGS);