small code cleanups

languagetool-org · Mar 23, 2015 · f7176eb · f7176eb
1 parent a173a2f
commit f7176eb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/AvsAnRule.java b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/AvsAnRule.java
@@ -19,12 +19,7 @@
 package org.languagetool.rules.en;
 
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ResourceBundle;
-import java.util.Scanner;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
 
 import org.languagetool.AnalyzedSentence;
 import org.languagetool.AnalyzedTokenReadings;
@@ -55,8 +50,8 @@ public class AvsAnRule extends EnglishRule {
 
   public AvsAnRule(final ResourceBundle messages) {
     super.setCategory(new Category(messages.getString("category_misc")));
-    requiresA = loadWords(JLanguageTool.getDataBroker().getFromRulesDirAsStream(FILENAME_A));
-    requiresAn = loadWords(JLanguageTool.getDataBroker().getFromRulesDirAsStream(FILENAME_AN));
+    requiresA = loadWords(FILENAME_A);
+    requiresAn = loadWords(FILENAME_AN);
     setLocQualityIssueType(ITSIssueType.Misspelling);
     addExamplePair(Example.wrong("The train arrived <marker>a hour</marker> ago."),
                    Example.fixed("The train arrived <marker>an hour</marker> ago."));
@@ -214,11 +209,12 @@ private static boolean isVowel(char c) {
   /**
    * Load words, normalized to lowercase unless starting with '*'.
    */
-  private Set<String> loadWords(final InputStream stream) {
-    final Set<String> set = new TreeSet<>();
+  private Set<String> loadWords(String path) {
+    InputStream stream = JLanguageTool.getDataBroker().getFromRulesDirAsStream(path);
+    Set<String> set = new TreeSet<>();
     try (Scanner scanner = new Scanner(stream, "utf-8")) {
       while (scanner.hasNextLine()) {
-        final String line = scanner.nextLine().trim();
+        String line = scanner.nextLine().trim();
         if (line.length() < 1 || line.charAt(0) == '#') {
           continue;
         }
@@ -229,7 +225,7 @@ private Set<String> loadWords(final InputStream stream) {
         }
       }
     }
-    return set;
+    return Collections.unmodifiableSet(set);
   }
 
   @Override

diff --git a/...l-language-modules/en/src/main/java/org/languagetool/synthesis/en/EnglishSynthesizer.java b/...l-language-modules/en/src/main/java/org/languagetool/synthesis/en/EnglishSynthesizer.java
@@ -75,13 +75,12 @@ public EnglishSynthesizer() {
   @Override
   public String[] synthesize(final AnalyzedToken token, final String posTag)
       throws IOException {
+    String aOrAn = aVsAnRule.suggestAorAn(token.getToken());
     if (ADD_DETERMINER.equals(posTag)) {
-      return new String[] { aVsAnRule.suggestAorAn(token.getToken()),
-          "the " + token.getToken() };
+      return new String[] { aOrAn, "the " + token.getToken() };
     } else if (ADD_IND_DETERMINER.equals(posTag)) {
-      return new String[] { aVsAnRule.suggestAorAn(token.getToken()) };
+      return new String[] { aOrAn};
     }
-
     final IStemmer synthesizer = createStemmer();
     final List<WordData> wordData = synthesizer.lookup(token.getLemma() + "|" + posTag);
     final List<String> wordForms = new ArrayList<>();

diff --git a/...l-language-modules/uk/src/test/java/org/languagetool/rules/uk/TokenAgreementRuleTest.java b/...l-language-modules/uk/src/test/java/org/languagetool/rules/uk/TokenAgreementRuleTest.java
@@ -35,7 +35,8 @@
 import org.languagetool.rules.RuleMatch;
 
 public class TokenAgreementRuleTest {
-  private static final ArrayList<RuleMatch> EMPTY_MATCH_LIST = new ArrayList<RuleMatch>();
+
+  private static final List<RuleMatch> EMPTY_MATCH_LIST = new ArrayList<>();
 
   private JLanguageTool langTool;
   private TokenAgreementRule rule;