lib/exercises-in-programming-style
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

things: Refactor DataStorageManager to be more idiomatic.

Browse Source
This commit is contained in:
David Foster
2014-01-05 20:47:26 -08:00
parent 331b841a5c
commit d28cc63b4b
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
10-things/tf_10.java
View File

@@ -32,7 +32,7 @@ class WordFrequencyController extends TFExercise {
} }
public void run() { public void run() {
for (String word : this.storageManager.calculateWords()) { for (String word : this.storageManager.getWords()) {
if (!this.stopWordManager.isStopWord(word)) { if (!this.stopWordManager.isStopWord(word)) {
this.wordFreqManager.incrementCount(word); this.wordFreqManager.incrementCount(word);
} }
@@ -52,27 +52,28 @@ class WordFrequencyController extends TFExercise {
/** Models the contents of the file. */ /** Models the contents of the file. */
class DataStorageManager extends TFExercise { class DataStorageManager extends TFExercise {
private String data; private List<String> words;
public DataStorageManager(String pathToFile) throws IOException { public DataStorageManager(String pathToFile) throws IOException {
byte[] dataBytes; this.words = new ArrayList<String>();
RandomAccessFile f = new RandomAccessFile(new File(pathToFile), "r");
Scanner f = new Scanner(new File(pathToFile), "UTF-8");
try { try {
dataBytes = new byte[(int) f.length()]; f.useDelimiter("[\\W_]+");
f.readFully(dataBytes); while (f.hasNext()) {
this.words.add(f.next().toLowerCase());
}
} finally { } finally {
f.close(); f.close();
} }
this.data = new String(dataBytes, "UTF-8").replaceAll("[\\W_]+", " ").toLowerCase();
} }
public String[] calculateWords() { public List<String> getWords() {
return this.data.split("\\s+"); return this.words;
} }
public String getInfo() { public String getInfo() {
return super.getInfo() + ": My major data structure is a " + this.data.getClass().getName(); return super.getInfo() + ": My major data structure is a " + this.words.getClass().getName();
} }
} }