Final Gui

Author: adrianbrink

src/main/java/GUI.java

@@ -50,10 +50,12 @@ public void handle(ActionEvent event) {
  String userInput = SearchTextField.getText();
 
  //Test for input from user:
- HashSet<String> results = SearchCmd.searchConstruct(userInput, hashMap);
+ HashSet<String> results = Searcher.search(userInput, hashMap);
 
- for(String result: results) { // for-each loop
- resultText.appendText(result +"\n");
+ if (results != null) {
+ for (String result : results) { // for-each loop
+ resultText.appendText(result + "\n");
+ }
  }
  }
  });

src/main/java/SearchCmd.java

@@ -3,13 +3,6 @@
 
 public class Searcher {
 
-/*
-|--------------------------------------------------------------------------
-| Public Methods
-|--------------------------------------------------------------------------
-|
-*/
-
  public static HashSet<String> search(String query, LinkedHashMap hashMap){
 
  HashSet<String> resultOne = new HashSet<String>();
@@ -38,6 +31,8 @@ public static HashSet<String> search(String query, LinkedHashMap hashMap){
  } else if (parts.length == 1) {
  resultOne = Searcher.retrieveResult(hashMap, parts[0]);
  return resultOne;
+ } else if (query == null || query.length() == 0) {
+ return null;
  }
  return resultOne;
  }