X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fparser%2Fwiktionary%2FEnForeignParser.java;h=6dbe3ecaf102f3edcd132d0b1ed1c8dab2e19741;hb=972c207ed3b98a7bee6b472db1d94391f4dbf24f;hp=f89b7100fdaf9cdf61f8016ed1bcf096230bd65c;hpb=db5b09de08e526988f90f02d64a0c7e9af3b477d;p=DictionaryPC.git diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/EnForeignParser.java b/src/com/hughes/android/dictionary/parser/wiktionary/EnForeignParser.java index f89b710..6dbe3ec 100644 --- a/src/com/hughes/android/dictionary/parser/wiktionary/EnForeignParser.java +++ b/src/com/hughes/android/dictionary/parser/wiktionary/EnForeignParser.java @@ -317,99 +317,4 @@ public final class EnForeignParser extends EnParser { } - private void itConjAre(List args, Map namedArgs) { - final String base = args.get(0); - final String aux = args.get(1); - - putIfMissing(namedArgs, "inf", base + "are"); - putIfMissing(namedArgs, "aux", aux); - putIfMissing(namedArgs, "ger", base + "ando"); - putIfMissing(namedArgs, "presp", base + "ante"); - putIfMissing(namedArgs, "pastp", base + "ato"); - // Present - putIfMissing(namedArgs, "pres1s", base + "o"); - putIfMissing(namedArgs, "pres2s", base + "i"); - putIfMissing(namedArgs, "pres3s", base + "a"); - putIfMissing(namedArgs, "pres1p", base + "iamo"); - putIfMissing(namedArgs, "pres2p", base + "ate"); - putIfMissing(namedArgs, "pres3p", base + "ano"); - // Imperfect - putIfMissing(namedArgs, "imperf1s", base + "avo"); - putIfMissing(namedArgs, "imperf2s", base + "avi"); - putIfMissing(namedArgs, "imperf3s", base + "ava"); - putIfMissing(namedArgs, "imperf1p", base + "avamo"); - putIfMissing(namedArgs, "imperf2p", base + "avate"); - putIfMissing(namedArgs, "imperf3p", base + "avano"); - // Passato remoto - putIfMissing(namedArgs, "prem1s", base + "ai"); - putIfMissing(namedArgs, "prem2s", base + "asti"); - putIfMissing(namedArgs, "prem3s", base + "ò"); - putIfMissing(namedArgs, "prem1p", base + "ammo"); - putIfMissing(namedArgs, "prem2p", base + "aste"); - putIfMissing(namedArgs, "prem3p", base + "arono"); - // Future - putIfMissing(namedArgs, "fut1s", base + "erò"); - putIfMissing(namedArgs, "fut2s", base + "erai"); - putIfMissing(namedArgs, "fut3s", base + "erà"); - putIfMissing(namedArgs, "fut1p", base + "eremo"); - putIfMissing(namedArgs, "fut2p", base + "erete"); - putIfMissing(namedArgs, "fut3p", base + "eranno"); - // Conditional - putIfMissing(namedArgs, "cond1s", base + "erei"); - putIfMissing(namedArgs, "cond2s", base + "eresti"); - putIfMissing(namedArgs, "cond3s", base + "erebbe"); - putIfMissing(namedArgs, "cond1p", base + "eremmo"); - putIfMissing(namedArgs, "cond2p", base + "ereste"); - putIfMissing(namedArgs, "cond3p", base + "erebbero"); - // Subjunctive / congiuntivo - putIfMissing(namedArgs, "sub123s", base + "i"); - putIfMissing(namedArgs, "sub1p", base + "iamo"); - putIfMissing(namedArgs, "sub2p", base + "iate"); - putIfMissing(namedArgs, "sub3p", base + "ino"); - // Imperfect subjunctive - putIfMissing(namedArgs, "impsub12s", base + "assi"); - putIfMissing(namedArgs, "impsub3s", base + "asse"); - putIfMissing(namedArgs, "impsub1p", base + "assimo"); - putIfMissing(namedArgs, "impsub2p", base + "aste"); - putIfMissing(namedArgs, "impsub3p", base + "assero"); - // Imperative - putIfMissing(namedArgs, "imp2s", base + "a"); - putIfMissing(namedArgs, "imp3s", base + "i"); - putIfMissing(namedArgs, "imp1p", base + "iamo"); - putIfMissing(namedArgs, "imp2p", base + "ate"); - putIfMissing(namedArgs, "imp3p", base + "ino"); - - - itConj(args, namedArgs); - } - - - private void itConj(List args, Map namedArgs) { - // TODO Auto-generated method stub - - } - - - private static void putIfMissing(final Map namedArgs, final String key, - final String value) { - final String oldValue = namedArgs.get(key); - if (oldValue == null || oldValue.length() == 0) { - namedArgs.put(key, value); - } - } - - // TODO: check how ='' and =| are manifested.... - // TODO: get this right in -are - private static void putOrNullify(final Map namedArgs, final String key, - final String value) { - final String oldValue = namedArgs.get(key); - if (oldValue == null/* || oldValue.length() == 0*/) { - namedArgs.put(key, value); - } else { - if (oldValue.equals("''")) { - namedArgs.put(key, ""); - } - } - } - } // ForeignParser \ No newline at end of file