Start using @VisibleFot testing and ImmutableMap.of

Author: jamo

tmc-plugin/src/fi/helsinki/cs/tmc/model/TmcProjectInfo.java

@@ -22,7 +22,7 @@ public class TmcProjectInfo {
 
     private Project project;
 
-    /*package*/ TmcProjectInfo(Project project) {
+    @VisibleForTesting TmcProjectInfo(Project project) {
         this.project = project;
     }
 

tmc-plugin/src/fi/helsinki/cs/tmc/utilities/Inflector.java

@@ -1,14 +1,12 @@
 package fi.helsinki.cs.tmc.utilities;
 
-import java.util.HashMap;
+import com.google.common.collect.ImmutableMap;
+import java.util.Map;
 
 public class Inflector {
-    private static final HashMap<String, String> specialPlurals;
-    static {
-        specialPlurals = new HashMap<String, String>();
-        specialPlurals.put("is", "are");
-    }
-    
+
+    private static final Map<String, String> specialPlurals = ImmutableMap.of("is", "are");
+
     /**
      * pluralize(1, "foo") -> "foo"; pluralize(3, "foo") -> "foos" plus some special cases.
      */