X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fparser%2Fwiktionary%2FItFunctionCallbacks.java;h=8278ccd09b8804b1096bfea35bff5545ff1ce885;hb=e479ba38bbcb261951399326623c20ffacc147d4;hp=bd975b2b503b7cfad08d044f0e78e4a6e634abad;hpb=0cde0a508bc65074c94b408e9f74b01aca9b8b29;p=DictionaryPC.git diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/ItFunctionCallbacks.java b/src/com/hughes/android/dictionary/parser/wiktionary/ItFunctionCallbacks.java index bd975b2..8278ccd 100644 --- a/src/com/hughes/android/dictionary/parser/wiktionary/ItFunctionCallbacks.java +++ b/src/com/hughes/android/dictionary/parser/wiktionary/ItFunctionCallbacks.java @@ -24,7 +24,7 @@ import java.util.Map; class ItFunctionCallbacks { static void addGenericCallbacks( - Map> callbacks) { + Map> callbacks) { callbacks.put("-hyph-", new Redispatch("\n==== Sillabazione ====\n")); callbacks.put("-pron-", new Redispatch("\n==== Pronuncia ====\n")); callbacks.put("-etim-", new Redispatch("\n==== Etimologia / Derivazione ====\n")); @@ -32,19 +32,19 @@ class ItFunctionCallbacks { callbacks.put("-ant-", new Redispatch("\n==== Antonimi/Contrari ====\n")); callbacks.put("-drv-", new Redispatch("\n==== Parole derivate ====\n")); callbacks.put("-prov-", new Redispatch("\n==== Proverbi e modi di dire ====\n")); - callbacks.put("-rel-", new Redispatch("\n==== Termini correlati ====\n")); callbacks.put("-ref-", new Redispatch("\n==== Note / Riferimenti ====\n")); + callbacks.put("-rel-", new Redispatch("\n==== Termini correlati ====\n")); callbacks.put("-var-", new Redispatch("\n==== Varianti ====\n")); callbacks.put("-trans1-", new SkipSection()); callbacks.put("-trans2-", new SkipSection()); - + callbacks.put("-ref-", new SkipSection()); } static final NameAndArgs NAME_AND_ARGS = new NameAndArgs(); static final class Redispatch implements - FunctionCallback { + FunctionCallback { final String newText; public Redispatch(String newText) { @@ -53,10 +53,10 @@ class ItFunctionCallbacks { @Override public boolean onWikiFunction(final WikiTokenizer wikiTokenizer, final String name, - final List args, - final Map namedArgs, - final T parser, - final AppendAndIndexWikiCallback appendAndIndexWikiCallback) { + final List args, + final Map namedArgs, + final T parser, + final AppendAndIndexWikiCallback appendAndIndexWikiCallback) { if (!namedArgs.isEmpty() || args.size() != 0) { return false; } @@ -66,18 +66,18 @@ class ItFunctionCallbacks { } static final class SkipSection implements - FunctionCallback { + FunctionCallback { public SkipSection() { } @Override public boolean onWikiFunction(final WikiTokenizer wikiTokenizer, final String name, - final List args, - final Map namedArgs, - final T parser, - final AppendAndIndexWikiCallback appendAndIndexWikiCallback) { + final List args, + final Map namedArgs, + final T parser, + final AppendAndIndexWikiCallback appendAndIndexWikiCallback) { while (wikiTokenizer.nextToken() != null) { - if (wikiTokenizer.isFunction() + if (wikiTokenizer.isFunction() && wikiTokenizer.functionName().startsWith("-") && wikiTokenizer.functionName().endsWith("-") // Hack to prevent infinite-looping, would be better to check that this func was at the start of the line.