From: Reimar Döffinger Date: Mon, 13 Apr 2020 12:10:39 +0000 (+0200) Subject: Import cleanup/changes for Eclipse compatibility. X-Git-Url: http://gitweb.fperrin.net/?p=DictionaryPC.git;a=commitdiff_plain;h=5a1b9f8a37d03dc675e1d895817422e9743a5b5b Import cleanup/changes for Eclipse compatibility. Unfortunately Eclipse insists on fiddling with imports without knowing what it does, thus breaking compilation and in one case causing a bug that will result in subtly broken dictionaries. --- diff --git a/src/com/hughes/android/dictionary/SerializeCollatorTest.java b/src/com/hughes/android/dictionary/SerializeCollatorTest.java index 7a1e42e..845bdba 100644 --- a/src/com/hughes/android/dictionary/SerializeCollatorTest.java +++ b/src/com/hughes/android/dictionary/SerializeCollatorTest.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.Comparator; import com.hughes.android.dictionary.engine.Language; -import java.text.Collator; public class SerializeCollatorTest { diff --git a/src/com/hughes/android/dictionary/engine/CheckDictionariesMain.java b/src/com/hughes/android/dictionary/engine/CheckDictionariesMain.java index 09e6710..bac2396 100644 --- a/src/com/hughes/android/dictionary/engine/CheckDictionariesMain.java +++ b/src/com/hughes/android/dictionary/engine/CheckDictionariesMain.java @@ -1,9 +1,5 @@ package com.hughes.android.dictionary.engine; -import com.hughes.android.dictionary.DictionaryInfo; -import com.hughes.android.dictionary.DictionaryInfo.IndexInfo; -import com.hughes.util.CollectionUtil; - import java.io.File; import java.io.IOException; import java.io.PrintWriter; @@ -13,6 +9,10 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import com.hughes.android.dictionary.DictionaryInfo; +import com.hughes.android.dictionary.DictionaryInfo.IndexInfo; +import com.hughes.util.CollectionUtil; + public class CheckDictionariesMain { static final String BASE_URL = "https://github.com/rdoeffinger/Dictionary/releases/download/v0.3-dictionaries/"; diff --git a/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java b/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java index cf5fa96..75e3a08 100644 --- a/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java +++ b/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java @@ -14,12 +14,6 @@ package com.hughes.android.dictionary.engine; -import com.hughes.android.dictionary.parser.wiktionary.EnTranslationToTranslationParser; -import com.hughes.android.dictionary.parser.wiktionary.WholeSectionToHtmlParser; -import com.hughes.android.dictionary.parser.wiktionary.WiktionaryLangs; - -import junit.framework.TestCase; - import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -29,6 +23,12 @@ import java.util.List; import java.util.Map; import java.util.Set; +import com.hughes.android.dictionary.parser.wiktionary.EnTranslationToTranslationParser; +import com.hughes.android.dictionary.parser.wiktionary.WholeSectionToHtmlParser; +import com.hughes.android.dictionary.parser.wiktionary.WiktionaryLangs; + +import junit.framework.TestCase; + public class DictionaryBuilderMain extends TestCase { static final String INPUTS = "data/inputs/"; diff --git a/src/com/hughes/android/dictionary/engine/DictionaryTest.java b/src/com/hughes/android/dictionary/engine/DictionaryTest.java index d1dcc2b..8b25f9d 100644 --- a/src/com/hughes/android/dictionary/engine/DictionaryTest.java +++ b/src/com/hughes/android/dictionary/engine/DictionaryTest.java @@ -21,11 +21,11 @@ import java.util.List; import java.util.Random; import java.util.concurrent.atomic.AtomicBoolean; -import junit.framework.TestCase; - import com.hughes.android.dictionary.engine.Index.IndexEntry; import com.hughes.util.CollectionUtil; +import junit.framework.TestCase; + public class DictionaryTest extends TestCase { diff --git a/src/com/hughes/android/dictionary/engine/LanguageTest.java b/src/com/hughes/android/dictionary/engine/LanguageTest.java index 24fe094..1a884a4 100644 --- a/src/com/hughes/android/dictionary/engine/LanguageTest.java +++ b/src/com/hughes/android/dictionary/engine/LanguageTest.java @@ -21,12 +21,12 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import junit.framework.TestCase; - import com.hughes.android.dictionary.parser.DictFileParser; import com.hughes.android.dictionary.parser.wiktionary.WiktionaryLangs; import com.ibm.icu.text.Transliterator; +import junit.framework.TestCase; + public class LanguageTest extends TestCase { public void testGermanSort() { diff --git a/src/com/hughes/android/dictionary/engine/WiktionarySplitter.java b/src/com/hughes/android/dictionary/engine/WiktionarySplitter.java index d39e6c3..12422fd 100644 --- a/src/com/hughes/android/dictionary/engine/WiktionarySplitter.java +++ b/src/com/hughes/android/dictionary/engine/WiktionarySplitter.java @@ -20,8 +20,8 @@ import java.io.DataOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -33,8 +33,8 @@ import java.util.regex.Pattern; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; -import org.apache.xerces.jaxp.SAXParserFactoryImpl; import org.apache.commons.compress.compressors.CompressorStreamFactory; +import org.apache.xerces.jaxp.SAXParserFactoryImpl; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/src/com/hughes/android/dictionary/engine/WriteBuffer.java b/src/com/hughes/android/dictionary/engine/WriteBuffer.java index c68264e..a8a92ee 100644 --- a/src/com/hughes/android/dictionary/engine/WriteBuffer.java +++ b/src/com/hughes/android/dictionary/engine/WriteBuffer.java @@ -14,8 +14,8 @@ package com.hughes.android.dictionary.engine; -import java.io.OutputStream; import java.io.IOException; +import java.io.OutputStream; import java.io.PipedInputStream; import java.io.PipedOutputStream; diff --git a/src/com/hughes/android/dictionary/parser/DictFileParser.java b/src/com/hughes/android/dictionary/parser/DictFileParser.java index 07d0775..6d8c561 100644 --- a/src/com/hughes/android/dictionary/parser/DictFileParser.java +++ b/src/com/hughes/android/dictionary/parser/DictFileParser.java @@ -23,7 +23,6 @@ import java.nio.charset.Charset; import java.util.Arrays; import java.util.Collections; import java.util.LinkedHashSet; -import java.util.List; import java.util.Set; import java.util.logging.Logger; import java.util.regex.Matcher; @@ -31,12 +30,11 @@ import java.util.regex.Pattern; import com.hughes.android.dictionary.engine.DictionaryBuilder; import com.hughes.android.dictionary.engine.EntrySource; -import com.hughes.android.dictionary.engine.IndexedEntry; import com.hughes.android.dictionary.engine.EntryTypeName; import com.hughes.android.dictionary.engine.IndexBuilder; +import com.hughes.android.dictionary.engine.IndexedEntry; import com.hughes.android.dictionary.engine.Language; import com.hughes.android.dictionary.engine.PairEntry; -import com.hughes.android.dictionary.engine.PairEntry.Pair; public class DictFileParser implements Parser { @@ -153,7 +151,7 @@ public class DictFileParser implements Parser { if (subfields[1][i].length() == 0) { subfields[1][i] = "__"; } - pairEntry.pairs.add(new Pair(subfields[0][i], subfields[1][i])); + pairEntry.pairs.add(new PairEntry.Pair(subfields[0][i], subfields[1][i])); } final IndexedEntry entryData = new IndexedEntry(pairEntry); entryData.isValid = true; diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/AbstractWiktionaryParser.java b/src/com/hughes/android/dictionary/parser/wiktionary/AbstractWiktionaryParser.java index 3fe8089..55a57f4 100644 --- a/src/com/hughes/android/dictionary/parser/wiktionary/AbstractWiktionaryParser.java +++ b/src/com/hughes/android/dictionary/parser/wiktionary/AbstractWiktionaryParser.java @@ -19,8 +19,8 @@ import java.io.DataInputStream; import java.io.EOFException; import java.io.File; import java.io.FileInputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; @@ -34,8 +34,8 @@ import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.compress.compressors.CompressorStreamFactory; import org.apache.commons.compress.compressors.CompressorException; +import org.apache.commons.compress.compressors.CompressorStreamFactory; import com.hughes.android.dictionary.engine.EntrySource; import com.hughes.android.dictionary.engine.EntryTypeName; diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/DeFunctionCallbacks.java b/src/com/hughes/android/dictionary/parser/wiktionary/DeFunctionCallbacks.java index 8711191..5e7960c 100644 --- a/src/com/hughes/android/dictionary/parser/wiktionary/DeFunctionCallbacks.java +++ b/src/com/hughes/android/dictionary/parser/wiktionary/DeFunctionCallbacks.java @@ -14,13 +14,13 @@ 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 void addGenericCallbacks(Map> callbacks) { diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/EnForeignParser.java b/src/com/hughes/android/dictionary/parser/wiktionary/EnForeignParser.java index 670462f..a092d5c 100644 --- a/src/com/hughes/android/dictionary/parser/wiktionary/EnForeignParser.java +++ b/src/com/hughes/android/dictionary/parser/wiktionary/EnForeignParser.java @@ -24,7 +24,6 @@ import com.hughes.android.dictionary.engine.EntryTypeName; import com.hughes.android.dictionary.engine.IndexBuilder; import com.hughes.android.dictionary.engine.IndexedEntry; import com.hughes.android.dictionary.engine.PairEntry; -import com.hughes.android.dictionary.engine.PairEntry.Pair; import com.hughes.android.dictionary.parser.WikiTokenizer; public final class EnForeignParser extends EnParser { @@ -236,7 +235,7 @@ public final class EnForeignParser extends EnParser { final String english = trim(englishBuilder.toString()); if (english.length() > 0) { - final Pair pair = new Pair(english, trim(foreignText), this.swap); + final PairEntry.Pair pair = new PairEntry.Pair(english, trim(foreignText), this.swap); pairEntry.pairs.add(pair); foreignIndexBuilder.addEntryWithString(indexedEntry, title, entryIsFormOfSomething ? EntryTypeName.WIKTIONARY_IS_FORM_OF_SOMETHING_ELSE : EntryTypeName.WIKTIONARY_TITLE_MULTI); for (final String form : forms) { @@ -265,14 +264,14 @@ public final class EnForeignParser extends EnParser { if ((nextPrefix.equals("#:") || nextPrefix.equals("##:")) && dash != -1) { final String foreignEx = nextLine.substring(0, dash); final String englishEx = nextLine.substring(dash + mdashLen); - final Pair pair = new Pair(formatAndIndexExampleString(englishEx, enIndexBuilder, indexedEntry), formatAndIndexExampleString(foreignEx, foreignIndexBuilder, indexedEntry), swap); + final PairEntry.Pair pair = new PairEntry.Pair(formatAndIndexExampleString(englishEx, enIndexBuilder, indexedEntry), formatAndIndexExampleString(foreignEx, foreignIndexBuilder, indexedEntry), swap); if (pair.lang1 != "--" && pair.lang1 != "--") { pairEntry.pairs.add(pair); } lastForeign = null; // TODO: make #* and #*: work } else if (nextPrefix.equals("#:") || nextPrefix.equals("##:")/* || nextPrefix.equals("#*")*/) { - final Pair pair = new Pair("--", formatAndIndexExampleString(nextLine, null, indexedEntry), swap); + final PairEntry.Pair pair = new PairEntry.Pair("--", formatAndIndexExampleString(nextLine, null, indexedEntry), swap); lastForeign = nextLine; if (pair.lang1 != "--" && pair.lang1 != "--") { pairEntry.pairs.add(pair); @@ -288,27 +287,27 @@ public final class EnForeignParser extends EnParser { } } pairEntry.pairs.remove(pairEntry.pairs.size() - 1); - final Pair pair = new Pair(formatAndIndexExampleString(nextLine, enIndexBuilder, indexedEntry), formatAndIndexExampleString(lastForeign, foreignIndexBuilder, indexedEntry), swap); + final PairEntry.Pair pair = new PairEntry.Pair(formatAndIndexExampleString(nextLine, enIndexBuilder, indexedEntry), formatAndIndexExampleString(lastForeign, foreignIndexBuilder, indexedEntry), swap); if (pair.lang1 != "--" || pair.lang2 != "--") { pairEntry.pairs.add(pair); } lastForeign = null; } else { LOG.warning("TODO: English example with no foreign: " + title + ", " + nextLine); - final Pair pair = new Pair("--", formatAndIndexExampleString(nextLine, null, indexedEntry), swap); + final PairEntry.Pair pair = new PairEntry.Pair("--", formatAndIndexExampleString(nextLine, null, indexedEntry), swap); if (pair.lang1 != "--" || pair.lang2 != "--") { pairEntry.pairs.add(pair); } } } else if (nextPrefix.equals("#*")) { // Can't really index these. - final Pair pair = new Pair("--", formatAndIndexExampleString(nextLine, null, indexedEntry), swap); + final PairEntry.Pair pair = new PairEntry.Pair("--", formatAndIndexExampleString(nextLine, null, indexedEntry), swap); lastForeign = nextLine; if (pair.lang1 != "--" || pair.lang2 != "--") { pairEntry.pairs.add(pair); } } else if (nextPrefix.equals("#::*") || nextPrefix.equals("##") || nextPrefix.equals("#*:") || nextPrefix.equals("#:*") || true) { - final Pair pair = new Pair("--", formatAndIndexExampleString(nextLine, null, indexedEntry), swap); + final PairEntry.Pair pair = new PairEntry.Pair("--", formatAndIndexExampleString(nextLine, null, indexedEntry), swap); if (pair.lang1 != "--" || pair.lang2 != "--") { pairEntry.pairs.add(pair); } diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java b/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java index 5e37a0a..5419ad9 100644 --- a/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java +++ b/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java @@ -14,15 +14,6 @@ package com.hughes.android.dictionary.parser.wiktionary; -import com.hughes.android.dictionary.engine.EntryTypeName; -import com.hughes.android.dictionary.engine.IndexBuilder; -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.util.ListUtil; -import com.hughes.util.MapUtil; -import com.hughes.util.StringUtil; - import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedHashMap; @@ -32,6 +23,15 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; +import com.hughes.android.dictionary.engine.EntryTypeName; +import com.hughes.android.dictionary.engine.IndexBuilder; +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.util.ListUtil; +import com.hughes.util.MapUtil; +import com.hughes.util.StringUtil; + class EnFunctionCallbacks { static final Map> DEFAULT = new LinkedHashMap>(); diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/EnTranslationToTranslationParser.java b/src/com/hughes/android/dictionary/parser/wiktionary/EnTranslationToTranslationParser.java index 4bf4903..67f451a 100644 --- a/src/com/hughes/android/dictionary/parser/wiktionary/EnTranslationToTranslationParser.java +++ b/src/com/hughes/android/dictionary/parser/wiktionary/EnTranslationToTranslationParser.java @@ -15,17 +15,16 @@ package com.hughes.android.dictionary.parser.wiktionary; import java.util.Arrays; +import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.HashSet; import java.util.regex.Pattern; import com.hughes.android.dictionary.engine.IndexBuilder; import com.hughes.android.dictionary.engine.IndexedEntry; import com.hughes.android.dictionary.engine.PairEntry; -import com.hughes.android.dictionary.engine.PairEntry.Pair; import com.hughes.android.dictionary.parser.WikiTokenizer; import com.hughes.android.dictionary.parser.wiktionary.EnFunctionCallbacks.TranslationCallback; import com.hughes.util.ListUtil; @@ -38,7 +37,7 @@ public final class EnTranslationToTranslationParser extends AbstractWiktionaryPa PairEntry pairEntry = null; IndexedEntry indexedEntry = null; StringBuilder[] builders = null; - HashSet allPairs = new HashSet(); + HashSet allPairs = new HashSet<>(); public static final String NAME = "EnTranslationToTranslation"; @@ -145,12 +144,12 @@ public final class EnTranslationToTranslationParser extends AbstractWiktionaryPa final String lang1 = builders[0].toString(); final String lang2 = builders[1].toString(); if (lang1.length() > 0 && lang2.length() > 0) { - final Pair newPair = new Pair(lang1, lang2); + final PairEntry.Pair newPair = new PairEntry.Pair(lang1, lang2); // brute-force approach to prevent adding duplicates if (!allPairs.contains(newPair)) { allPairs.add(newPair); - pairEntry.pairs.add(new Pair(lang1, lang2)); + pairEntry.pairs.add(new PairEntry.Pair(lang1, lang2)); indexedEntry.isValid = true; } } diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/FrFunctionCallbacks.java b/src/com/hughes/android/dictionary/parser/wiktionary/FrFunctionCallbacks.java index 2edf3ac..6f8fb60 100644 --- a/src/com/hughes/android/dictionary/parser/wiktionary/FrFunctionCallbacks.java +++ b/src/com/hughes/android/dictionary/parser/wiktionary/FrFunctionCallbacks.java @@ -14,14 +14,14 @@ 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 void addGenericCallbacks(Map> callbacks) { diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/ItFunctionCallbacks.java b/src/com/hughes/android/dictionary/parser/wiktionary/ItFunctionCallbacks.java index 8278ccd..22d3f9f 100644 --- a/src/com/hughes/android/dictionary/parser/wiktionary/ItFunctionCallbacks.java +++ b/src/com/hughes/android/dictionary/parser/wiktionary/ItFunctionCallbacks.java @@ -14,13 +14,13 @@ 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 ItFunctionCallbacks { static void addGenericCallbacks( diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/WholeSectionToHtmlParser.java b/src/com/hughes/android/dictionary/parser/wiktionary/WholeSectionToHtmlParser.java index 63e507e..e076362 100644 --- a/src/com/hughes/android/dictionary/parser/wiktionary/WholeSectionToHtmlParser.java +++ b/src/com/hughes/android/dictionary/parser/wiktionary/WholeSectionToHtmlParser.java @@ -1,6 +1,15 @@ package com.hughes.android.dictionary.parser.wiktionary; +import java.net.URI; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; + +import org.apache.commons.text.StringEscapeUtils; + import com.hughes.android.dictionary.engine.EntryTypeName; import com.hughes.android.dictionary.engine.HtmlEntry; import com.hughes.android.dictionary.engine.IndexBuilder; @@ -9,15 +18,6 @@ import com.hughes.android.dictionary.engine.IndexedEntry; import com.hughes.android.dictionary.parser.WikiTokenizer; import com.hughes.util.StringUtil; -import org.apache.commons.text.StringEscapeUtils; - -import java.net.URI; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.regex.Pattern; - public class WholeSectionToHtmlParser extends AbstractWiktionaryParser { public static final String NAME = "WholeSectionToHtmlParser"; diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java b/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java index 1160bf2..c493534 100644 --- a/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java +++ b/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java @@ -14,12 +14,8 @@ package com.hughes.android.dictionary.parser.wiktionary; -import com.hughes.android.dictionary.engine.Language; - import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.Map; -import java.util.Set; import java.util.regex.Pattern; public class WiktionaryLangs {