From d533f59cbe64f8db39d0660fe2a567fdfd48679a Mon Sep 17 00:00:00 2001
From: Adam Blank <blank@caltech.edu>
Date: Wed, 13 Feb 2019 21:55:01 -0800
Subject: [PATCH] Misc. ErrorProne Fixes
---
.idea/workspace.xml | 6 +++---
src/edu/caltech/cs2/datastructures/NGramMap.java | 3 ++-
src/edu/caltech/cs2/interfaces/IPriorityQueue.java | 6 ++++--
src/edu/caltech/cs2/misc/IntegerComparator.java | 2 ++
src/edu/caltech/cs2/types/NGram.java | 3 ++-
src/wordsuggestor/ParseFBMessages.java | 2 +-
6 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 834befc..e7fff03 100644
--- a/.idea/workspace.xml
+++ b/.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" />
diff --git a/src/edu/caltech/cs2/datastructures/NGramMap.java b/src/edu/caltech/cs2/datastructures/NGramMap.java
index 33a8d1d..25aa89d 100644
--- a/src/edu/caltech/cs2/datastructures/NGramMap.java
+++ b/src/edu/caltech/cs2/datastructures/NGramMap.java
@@ -100,6 +100,7 @@ public class NGramMap {
return null;
}
+ @Override
public String toString() {
return map.toString();
}
@@ -123,4 +124,4 @@ public class NGramMap {
public String[] getWordsAfter(NGram ngram, int k) {
return null;
}
-}
\ No newline at end of file
+}
diff --git a/src/edu/caltech/cs2/interfaces/IPriorityQueue.java b/src/edu/caltech/cs2/interfaces/IPriorityQueue.java
index 3edf55b..a2ea84a 100644
--- a/src/edu/caltech/cs2/interfaces/IPriorityQueue.java
+++ b/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 + ")";
}
@@ -45,4 +47,4 @@ public interface IPriorityQueue<E> extends IQueue<IPriorityQueue.PQElement<E>> {
*/
public void decreaseKey(PQElement<E> key);
-}
\ No newline at end of file
+}
diff --git a/src/edu/caltech/cs2/misc/IntegerComparator.java b/src/edu/caltech/cs2/misc/IntegerComparator.java
index 6c8f56b..c0399da 100644
--- a/src/edu/caltech/cs2/misc/IntegerComparator.java
+++ b/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);
}
diff --git a/src/edu/caltech/cs2/types/NGram.java b/src/edu/caltech/cs2/types/NGram.java
index e260716..24b324e 100644
--- a/src/edu/caltech/cs2/types/NGram.java
+++ b/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 = "";
@@ -67,4 +68,4 @@ public class NGram implements Iterable<String>, Comparable<NGram> {
public int compareTo(NGram o) {
return 0;
}
-}
\ No newline at end of file
+}
diff --git a/src/wordsuggestor/ParseFBMessages.java b/src/wordsuggestor/ParseFBMessages.java
index df2b841..5499d9d 100644
--- a/src/wordsuggestor/ParseFBMessages.java
+++ b/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()) {
--
GitLab