code cleanup

languagetool-org · Feb 23, 2015 · 17c4035 · 17c4035
1 parent 9d03a6b
commit 17c4035
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 28 deletions.
diff --git a/languagetool-core/src/main/java/org/languagetool/tagging/ManualTagger.java b/languagetool-core/src/main/java/org/languagetool/tagging/ManualTagger.java
@@ -22,10 +22,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import org.languagetool.synthesis.ManualSynthesizer;
 import org.languagetool.tools.StringTools;
@@ -42,14 +39,14 @@
  */
 public class ManualTagger implements WordTagger {
 
-  private final Map<String, List<LookedUpTerm>> mapping;
+  private final Map<String, List<TaggedWord>> mapping;
 
   public ManualTagger(final InputStream inputStream) throws IOException {
     mapping = loadMapping(inputStream, "utf8");
   }
 
-  private Map<String, List<LookedUpTerm>> loadMapping(final InputStream inputStream, final String encoding) throws IOException {
-    final Map<String, List<LookedUpTerm>> map = new HashMap<>();
+  private Map<String, List<TaggedWord>> loadMapping(final InputStream inputStream, final String encoding) throws IOException {
+    final Map<String, List<TaggedWord>> map = new HashMap<>();
     try (
       InputStreamReader reader = new InputStreamReader(inputStream, encoding);
       BufferedReader br = new BufferedReader(reader)
@@ -63,11 +60,11 @@ private Map<String, List<LookedUpTerm>> loadMapping(final InputStream inputStrea
         if (parts.length != 3) {
           throw new IOException("Unknown line format when loading manual tagger dictionary, expected three tab-separated fields: '" + line + "'");
         }
-        List<LookedUpTerm> terms = map.get(parts[0]);
+        List<TaggedWord> terms = map.get(parts[0]);
         if (terms == null) {
           terms = new ArrayList<>();
         }
-        terms.add(new LookedUpTerm(parts[1], parts[2]));
+        terms.add(new TaggedWord(parts[1], parts[2]));
         map.put(parts[0], terms);
       }
     }
@@ -79,26 +76,12 @@ private Map<String, List<LookedUpTerm>> loadMapping(final InputStream inputStrea
    */
   @Override
   public List<TaggedWord> tag(String word) {
-    List<TaggedWord> result = new ArrayList<>();
-    List<LookedUpTerm> lookedUpTerms = mapping.get(word);
+    List<TaggedWord> lookedUpTerms = mapping.get(word);
     if (lookedUpTerms != null) {
-      for (LookedUpTerm term : lookedUpTerms) {
-        result.add(new TaggedWord(term.baseform, term.posTags));
-      }
+      return Collections.unmodifiableList(lookedUpTerms);
+    } else {
+      return Collections.emptyList();
     }
-    return result;
-  }
-
-  private class LookedUpTerm {
-
-    final String baseform;
-    final String posTags;
-
-    LookedUpTerm(String baseform, String posTags) {
-      this.baseform = baseform;
-      this.posTags = posTags;
-    }
-
   }
 
 }
diff --git a/languagetool-core/src/main/java/org/languagetool/tagging/TaggedWord.java b/languagetool-core/src/main/java/org/languagetool/tagging/TaggedWord.java
@@ -22,7 +22,7 @@
  * Result of {@link org.languagetool.tagging.WordTagger}.
  * @since 2.8
  */
-public class TaggedWord {
+public final class TaggedWord {
 
   private final String lemma;
   private final String posTag;