Minor automated code simplifications.

[DictionaryPC.git] / src / com / hughes / android / dictionary / parser / wiktionary / EnTranslationToTranslationParser.java

diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/EnTranslationToTranslationParser.java b/src/com/hughes/android/dictionary/parser/wiktionary/EnTranslationToTranslationParser.java
index 4bf49033dca99a39c6e1ada0eefde892d283c8f2..042f0fac3289280cb91db44ac86f5404d09fba6d 100644 (file)
--- 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,11 +37,11 @@ public final class EnTranslationToTranslationParser extends AbstractWiktionaryPa
     PairEntry pairEntry = null;
     IndexedEntry indexedEntry = null;
     StringBuilder[] builders = null;
-    HashSet<Pair> allPairs = new HashSet<Pair>();
+    final HashSet<PairEntry.Pair> allPairs = new HashSet<>();
 
     public static final String NAME = "EnTranslationToTranslation";
 
-    final Set<String> Ts = new LinkedHashSet<String>(Arrays.asList("t", "t+",
+    final Set<String> Ts = new LinkedHashSet<>(Arrays.asList("t", "t+",
             "t-", "tø", "apdx-t", "ttbc"));
 
     public EnTranslationToTranslationParser(final List<IndexBuilder> indexBuilders,
@@ -89,10 +88,10 @@ public final class EnTranslationToTranslationParser extends AbstractWiktionaryPa
         }
     }
 
-    final TranslationCallback<EnTranslationToTranslationParser> translationCallback = new TranslationCallback<EnTranslationToTranslationParser>();
+    final TranslationCallback<EnTranslationToTranslationParser> translationCallback = new TranslationCallback<>();
 
-    final AppendAndIndexWikiCallback<EnTranslationToTranslationParser> appendAndIndexWikiCallback = new AppendAndIndexWikiCallback<EnTranslationToTranslationParser>(
-        this);
+    final AppendAndIndexWikiCallback<EnTranslationToTranslationParser> appendAndIndexWikiCallback = new AppendAndIndexWikiCallback<>(
+            this);
     {
         for (final String t : Ts) {
             appendAndIndexWikiCallback.functionCallbacks.put(t, translationCallback);
@@ -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;
             }
         }