Misc. ErrorProne Fixes

.idea/workspace.xml

@@ -133,7 +133,7 @@
         <entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/datastructures/MinFourHeap.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="192">
-              <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+              <caret line="8" selection-start-line="8" selection-end-line="8" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="e#829#830#0" expanded="true" />
@@ -242,7 +242,7 @@
     </dirStrings>
   </component>
   <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../../.." />
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
@@ -1348,7 +1348,7 @@
     <entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/datastructures/MinFourHeap.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="192">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+          <caret line="8" selection-start-line="8" selection-end-line="8" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="e#829#830#0" expanded="true" />

src/edu/caltech/cs2/datastructures/NGramMap.java

@@ -100,6 +100,7 @@ public class NGramMap {
         return null;
     }
 
+    @Override
     public String toString() {
         return map.toString();
     }

src/edu/caltech/cs2/interfaces/IPriorityQueue.java

@@ -15,10 +15,12 @@ public interface IPriorityQueue<E> extends IQueue<IPriorityQueue.PQElement<E>> {
             this.priority = priority;
         }
 
+        @Override
         public int hashCode() {
             return this.data.hashCode();
         }
 
+        @Override
         public boolean equals(Object o) {
             if (!(o instanceof PQElement)) {
                 return false;
@@ -26,7 +28,7 @@ public interface IPriorityQueue<E> extends IQueue<IPriorityQueue.PQElement<E>> {
             return this.data.equals(((PQElement)o).data);
         }
 
-
+        @Override
         public String toString() {
             return "(" + this.data + ", " + this.priority + ")";
         }

src/edu/caltech/cs2/misc/IntegerComparator.java

@@ -3,6 +3,7 @@ package edu.caltech.cs2.misc;
 import java.util.Comparator;
 
 public class IntegerComparator implements Comparator<Integer> {
+    @Override
     public int compare(Integer a, Integer b) {
         if (a < b) {
             return -1;
@@ -13,6 +14,7 @@ public class IntegerComparator implements Comparator<Integer> {
         return 1;
     }
 
+    @Override
     public boolean equals(Object obj) {
         return (this == obj);
     }

src/edu/caltech/cs2/types/NGram.java

@@ -48,6 +48,7 @@ public class NGram implements Iterable<String>, Comparable<NGram> {
         return new NGram(data);
     }
 
+    @Override
     public String toString() {
         String result = "";
         String prev = "";

src/wordsuggestor/ParseFBMessages.java

@@ -41,7 +41,7 @@ public final class ParseFBMessages {
         String archive = args[1];
 
         IQueue<String> messages = new ArrayDeque<String>();
-        File[] listOfFiles = (new File(archive + File.separator + "messages")).listFiles();
+        File[] listOfFiles = new File(archive + File.separator + "messages").listFiles();
 
         for (int i = 0; i < listOfFiles.length; i++) {
           if (listOfFiles[i].isFile()) {