From 8674b09eae371994e01e0af541b546fced86c366 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Reimar=20D=C3=B6ffinger?= Date: Mon, 13 Apr 2020 15:01:07 +0200 Subject: [PATCH] Clean up order of imports. --- Util | 2 +- .../dictionary/engine/AbstractEntry.java | 6 ++-- .../android/dictionary/engine/Dictionary.java | 12 ++++---- .../dictionary/engine/EntrySource.java | 6 ++-- .../android/dictionary/engine/HtmlEntry.java | 11 ++++---- .../android/dictionary/engine/Index.java | 28 +++++++++---------- .../android/dictionary/engine/Language.java | 6 ++-- .../engine/NormalizeComparator.java | 4 +-- .../android/dictionary/engine/PairEntry.java | 10 +++---- .../android/dictionary/engine/RowBase.java | 8 +++--- .../android/dictionary/engine/TextEntry.java | 8 +++--- .../android/dictionary/engine/TokenRow.java | 6 ++-- .../engine/TransliteratorManager.java | 3 +- 13 files changed, 54 insertions(+), 56 deletions(-) diff --git a/Util b/Util index 7efaa36..39617b8 160000 --- a/Util +++ b/Util @@ -1 +1 @@ -Subproject commit 7efaa369d15e363663e1c226c433569acb1050c0 +Subproject commit 39617b850d219b229f74981229ca99660ea135a5 diff --git a/src/com/hughes/android/dictionary/engine/AbstractEntry.java b/src/com/hughes/android/dictionary/engine/AbstractEntry.java index 77d26db..4563017 100644 --- a/src/com/hughes/android/dictionary/engine/AbstractEntry.java +++ b/src/com/hughes/android/dictionary/engine/AbstractEntry.java @@ -14,13 +14,13 @@ package com.hughes.android.dictionary.engine; -import com.hughes.util.IndexedObject; -import com.hughes.util.StringUtil; - import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; +import com.hughes.util.IndexedObject; +import com.hughes.util.StringUtil; + public abstract class AbstractEntry extends IndexedObject { public final EntrySource entrySource; diff --git a/src/com/hughes/android/dictionary/engine/Dictionary.java b/src/com/hughes/android/dictionary/engine/Dictionary.java index fef86bd..b500f7f 100644 --- a/src/com/hughes/android/dictionary/engine/Dictionary.java +++ b/src/com/hughes/android/dictionary/engine/Dictionary.java @@ -14,12 +14,6 @@ package com.hughes.android.dictionary.engine; -import com.hughes.android.dictionary.DictionaryInfo; -import com.hughes.util.CachingList; -import com.hughes.util.raf.RAFList; -import com.hughes.util.raf.RAFListSerializer; -import com.hughes.util.raf.RAFSerializable; - import java.io.ByteArrayOutputStream; import java.io.DataInput; import java.io.DataInputStream; @@ -37,6 +31,12 @@ import java.util.Collections; import java.util.List; import java.util.zip.GZIPOutputStream; +import com.hughes.android.dictionary.DictionaryInfo; +import com.hughes.util.CachingList; +import com.hughes.util.raf.RAFList; +import com.hughes.util.raf.RAFListSerializer; +import com.hughes.util.raf.RAFSerializable; + public class Dictionary implements RAFSerializable { private static final int CACHE_SIZE = 5000; diff --git a/src/com/hughes/android/dictionary/engine/EntrySource.java b/src/com/hughes/android/dictionary/engine/EntrySource.java index 42873c7..635724f 100644 --- a/src/com/hughes/android/dictionary/engine/EntrySource.java +++ b/src/com/hughes/android/dictionary/engine/EntrySource.java @@ -14,13 +14,13 @@ package com.hughes.android.dictionary.engine; -import com.hughes.util.IndexedObject; -import com.hughes.util.raf.RAFListSerializer; - import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; +import com.hughes.util.IndexedObject; +import com.hughes.util.raf.RAFListSerializer; + public class EntrySource extends IndexedObject { final String name; diff --git a/src/com/hughes/android/dictionary/engine/HtmlEntry.java b/src/com/hughes/android/dictionary/engine/HtmlEntry.java index f279a3d..59ed59b 100644 --- a/src/com/hughes/android/dictionary/engine/HtmlEntry.java +++ b/src/com/hughes/android/dictionary/engine/HtmlEntry.java @@ -1,22 +1,21 @@ package com.hughes.android.dictionary.engine; -import com.hughes.util.StringUtil; -import com.hughes.util.raf.RAFListSerializer; -import com.hughes.util.raf.RAFListSerializerSkippable; -import com.ibm.icu.text.Transliterator; - import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.io.PrintStream; -import java.io.UnsupportedEncodingException; import java.lang.ref.SoftReference; import java.nio.channels.FileChannel; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.regex.Pattern; +import com.hughes.util.StringUtil; +import com.hughes.util.raf.RAFListSerializer; +import com.hughes.util.raf.RAFListSerializerSkippable; +import com.ibm.icu.text.Transliterator; + public class HtmlEntry extends AbstractEntry implements Comparable { // Title is not HTML escaped. diff --git a/src/com/hughes/android/dictionary/engine/Index.java b/src/com/hughes/android/dictionary/engine/Index.java index b58384d..5812b68 100644 --- a/src/com/hughes/android/dictionary/engine/Index.java +++ b/src/com/hughes/android/dictionary/engine/Index.java @@ -14,19 +14,6 @@ package com.hughes.android.dictionary.engine; -import com.hughes.android.dictionary.DictionaryInfo; -import com.hughes.android.dictionary.DictionaryInfo.IndexInfo; -import com.hughes.android.dictionary.engine.RowBase.RowKey; -import com.hughes.util.CachingList; -import com.hughes.util.StringUtil; -import com.hughes.util.TransformingList; -import com.hughes.util.raf.RAFList; -import com.hughes.util.raf.RAFSerializable; -import com.hughes.util.raf.RAFSerializer; -import com.hughes.util.raf.SerializableSerializer; -import com.hughes.util.raf.UniformRAFList; -import com.ibm.icu.text.Transliterator; - import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -39,14 +26,27 @@ import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.EnumMap; -import java.util.HashSet; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Pattern; +import com.hughes.android.dictionary.DictionaryInfo; +import com.hughes.android.dictionary.DictionaryInfo.IndexInfo; +import com.hughes.android.dictionary.engine.RowBase.RowKey; +import com.hughes.util.CachingList; +import com.hughes.util.StringUtil; +import com.hughes.util.TransformingList; +import com.hughes.util.raf.RAFList; +import com.hughes.util.raf.RAFSerializable; +import com.hughes.util.raf.RAFSerializer; +import com.hughes.util.raf.SerializableSerializer; +import com.hughes.util.raf.UniformRAFList; +import com.ibm.icu.text.Transliterator; + public final class Index implements RAFSerializable { private static final int CACHE_SIZE = 5000; diff --git a/src/com/hughes/android/dictionary/engine/Language.java b/src/com/hughes/android/dictionary/engine/Language.java index 1822d93..d572d39 100644 --- a/src/com/hughes/android/dictionary/engine/Language.java +++ b/src/com/hughes/android/dictionary/engine/Language.java @@ -14,14 +14,14 @@ package com.hughes.android.dictionary.engine; -import com.hughes.android.dictionary.CollatorWrapper; -import com.hughes.android.dictionary.DictionaryApplication; - import java.util.Comparator; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import com.hughes.android.dictionary.CollatorWrapper; +import com.hughes.android.dictionary.DictionaryApplication; + public class Language { public static final class LanguageResources { diff --git a/src/com/hughes/android/dictionary/engine/NormalizeComparator.java b/src/com/hughes/android/dictionary/engine/NormalizeComparator.java index c744334..9283c36 100644 --- a/src/com/hughes/android/dictionary/engine/NormalizeComparator.java +++ b/src/com/hughes/android/dictionary/engine/NormalizeComparator.java @@ -14,10 +14,10 @@ package com.hughes.android.dictionary.engine; -import com.ibm.icu.text.Transliterator; - import java.util.Comparator; +import com.ibm.icu.text.Transliterator; + public class NormalizeComparator implements Comparator { private final Transliterator normalizer; diff --git a/src/com/hughes/android/dictionary/engine/PairEntry.java b/src/com/hughes/android/dictionary/engine/PairEntry.java index b9ac07c..d779485 100644 --- a/src/com/hughes/android/dictionary/engine/PairEntry.java +++ b/src/com/hughes/android/dictionary/engine/PairEntry.java @@ -14,11 +14,6 @@ package com.hughes.android.dictionary.engine; -import com.hughes.util.StringUtil; -import com.hughes.util.raf.RAFListSerializerSkippable; -import com.hughes.util.raf.RAFSerializable; -import com.ibm.icu.text.Transliterator; - import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -28,6 +23,11 @@ import java.util.Collections; import java.util.List; import java.util.regex.Pattern; +import com.hughes.util.StringUtil; +import com.hughes.util.raf.RAFListSerializerSkippable; +import com.hughes.util.raf.RAFSerializable; +import com.ibm.icu.text.Transliterator; + public class PairEntry extends AbstractEntry implements RAFSerializable, Comparable { diff --git a/src/com/hughes/android/dictionary/engine/RowBase.java b/src/com/hughes/android/dictionary/engine/RowBase.java index 844afcf..6f49e00 100644 --- a/src/com/hughes/android/dictionary/engine/RowBase.java +++ b/src/com/hughes/android/dictionary/engine/RowBase.java @@ -14,10 +14,6 @@ package com.hughes.android.dictionary.engine; -import com.hughes.util.IndexedObject; -import com.hughes.util.raf.RAFListSerializer; -import com.ibm.icu.text.Transliterator; - import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -26,6 +22,10 @@ import java.util.Comparator; import java.util.List; import java.util.regex.Pattern; +import com.hughes.util.IndexedObject; +import com.hughes.util.raf.RAFListSerializer; +import com.ibm.icu.text.Transliterator; + public abstract class RowBase extends IndexedObject { /** * the Index owning this RowBase. diff --git a/src/com/hughes/android/dictionary/engine/TextEntry.java b/src/com/hughes/android/dictionary/engine/TextEntry.java index 26cdc55..8dd88f4 100644 --- a/src/com/hughes/android/dictionary/engine/TextEntry.java +++ b/src/com/hughes/android/dictionary/engine/TextEntry.java @@ -14,10 +14,6 @@ package com.hughes.android.dictionary.engine; -import com.hughes.util.raf.RAFListSerializer; -import com.hughes.util.raf.RAFSerializable; -import com.ibm.icu.text.Transliterator; - import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -25,6 +21,10 @@ import java.io.PrintStream; import java.util.List; import java.util.regex.Pattern; +import com.hughes.util.raf.RAFListSerializer; +import com.hughes.util.raf.RAFSerializable; +import com.ibm.icu.text.Transliterator; + public class TextEntry extends AbstractEntry implements RAFSerializable { public final String text; diff --git a/src/com/hughes/android/dictionary/engine/TokenRow.java b/src/com/hughes/android/dictionary/engine/TokenRow.java index 3a19a93..4565fcc 100644 --- a/src/com/hughes/android/dictionary/engine/TokenRow.java +++ b/src/com/hughes/android/dictionary/engine/TokenRow.java @@ -14,15 +14,15 @@ package com.hughes.android.dictionary.engine; -import com.hughes.android.dictionary.engine.Index.IndexEntry; -import com.ibm.icu.text.Transliterator; - import java.io.DataInput; import java.io.IOException; import java.io.PrintStream; import java.util.List; import java.util.regex.Pattern; +import com.hughes.android.dictionary.engine.Index.IndexEntry; +import com.ibm.icu.text.Transliterator; + public class TokenRow extends RowBase { public final boolean hasMainEntry; diff --git a/src/com/hughes/android/dictionary/engine/TransliteratorManager.java b/src/com/hughes/android/dictionary/engine/TransliteratorManager.java index e328265..4dfb2b6 100644 --- a/src/com/hughes/android/dictionary/engine/TransliteratorManager.java +++ b/src/com/hughes/android/dictionary/engine/TransliteratorManager.java @@ -14,12 +14,11 @@ package com.hughes.android.dictionary.engine; -import com.ibm.icu.text.Transliterator; - import java.util.ArrayList; import java.util.List; import com.hughes.util.LRUCacheMap; +import com.ibm.icu.text.Transliterator; public class TransliteratorManager { -- 2.43.0