Minor simplification of DictFileParser.

diff --git a/src/com/hughes/android/dictionary/engine/DictionaryBuilder.java b/src/com/hughes/android/dictionary/engine/DictionaryBuilder.java
index 34cc705c39592cf45a5b3efa22bd4da39460a9c9..1d47448425bb87c55db87a52f21fe4fc2bc49f62 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/DictionaryBuilder.java
+++ b/src/com/hughes/android/dictionary/engine/DictionaryBuilder.java
@@ -150,10 +150,10 @@ public class DictionaryBuilder {
                 String inputFormat = keyValueArgs.remove(prefix + "Format");
                 if ("tab_separated".equals(inputFormat)) {
                     final boolean flipColumns = "true".equals(keyValueArgs.remove(prefix + "FlipColumns"));
-                    new DictFileParser(charset, flipColumns, DictFileParser.TAB, null, dictionaryBuilder, dictionaryBuilder.indexBuilders.toArray(new IndexBuilder[0]), null).parse(file, entrySource, pageLimit);
+                    new DictFileParser(charset, flipColumns, DictFileParser.TAB, null, dictionaryBuilder).parse(file, entrySource, pageLimit);
                 } else if ("chemnitz".equals(inputFormat)) {
                     final boolean flipColumns = "true".equals(keyValueArgs.remove(prefix + "FlipColumns"));
-                    new DictFileParser(charset, flipColumns, DictFileParser.DOUBLE_COLON, DictFileParser.PIPE, dictionaryBuilder, dictionaryBuilder.indexBuilders.toArray(new IndexBuilder[0]), null).parse(file, entrySource, pageLimit);
+                    new DictFileParser(charset, flipColumns, DictFileParser.DOUBLE_COLON, DictFileParser.PIPE, dictionaryBuilder).parse(file, entrySource, pageLimit);
                 } else if ("enwiktionary".equals(inputFormat)) {
                     final String type = keyValueArgs.remove(prefix + "WiktionaryType");
                     final Pattern langPattern = Pattern.compile(keyValueArgs.remove(prefix + "LangPattern"), Pattern.CASE_INSENSITIVE);

diff --git a/src/com/hughes/android/dictionary/parser/DictFileParser.java b/src/com/hughes/android/dictionary/parser/DictFileParser.java
index 0fa43060086ffce54d1567d9ecd3530c7b94586e..f825ac56bdea456e961b0c5c370ac1e34f1bafa4 100644 (file)
--- a/src/com/hughes/android/dictionary/parser/DictFileParser.java
+++ b/src/com/hughes/android/dictionary/parser/DictFileParser.java
@@ -66,8 +66,6 @@ public class DictFileParser implements Parser {
     final Pattern subfieldSplit;
 
     final DictionaryBuilder dictBuilder;
-    final IndexBuilder[] langIndexBuilders;
-    final IndexBuilder bothIndexBuilder;
 
     EntrySource entrySource;
 
@@ -75,15 +73,12 @@ public class DictFileParser implements Parser {
 
     public DictFileParser(final Charset charset, boolean flipCols,
                           final Pattern fieldSplit, final Pattern subfieldSplit,
-                          final DictionaryBuilder dictBuilder, final IndexBuilder[] langIndexBuilders,
-                          final IndexBuilder bothIndexBuilder) {
+                          final DictionaryBuilder dictBuilder) {
         this.charset = charset;
         this.flipCols = flipCols;
         this.fieldSplit = fieldSplit;
         this.subfieldSplit = subfieldSplit;
         this.dictBuilder = dictBuilder;
-        this.langIndexBuilders = langIndexBuilders;
-        this.bothIndexBuilder = bothIndexBuilder;
     }
 
     @Override
@@ -158,9 +153,9 @@ public class DictFileParser implements Parser {
         for (int l = 0; l < 2; ++l) {
             // alreadyDone.clear();
 
+            final IndexBuilder indexBuilder = dictBuilder.indexBuilders.get(l);
             for (int j = 0; j < subfields[l].length; ++j) {
                 String subfield = subfields[l][j];
-                final IndexBuilder indexBuilder = langIndexBuilders[l];
                 if (indexBuilder.index.sortLanguage == Language.de) {
                     subfield = parseField_DE(indexBuilder, subfield, entryData, j);
                 } else if (indexBuilder.index.sortLanguage == Language.en) {