Merge pull request #322 from junming403/master

Fix location searching

src/main/java/seedu/address/ui/CombinePanel.java

@@ -11,6 +11,8 @@
 import java.time.DayOfWeek;
 import java.util.Objects;
 import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import com.google.common.eventbus.Subscribe;
 
@@ -61,6 +63,8 @@ public class CombinePanel extends UiPart<Region> {
     private static final int COL = 13;
     private static final int START_TIME = 8;
 
+    private static final Pattern LOCATION_KEYWORD_PATTERN = Pattern.compile(".*(?=-)");
+
     private final Logger logger = LogsCenter.getLogger(this.getClass());
     private final Logic logic;
     private GridData[][] gridData;
@@ -288,7 +292,19 @@ private int getTime(String text) {
     /************* BROWSER PANNEL *********/
 
     private void loadLessonPage(ReadOnlyLesson lesson) {
-        loadPage(NUS_MAP_SEARCH_URL_PREFIX + lesson.getLocation().toString());
+        loadPage(NUS_MAP_SEARCH_URL_PREFIX + getImportantKeywords(lesson.getLocation().toString()));
+    }
+
+    /**
+     * Get substring before hyphen.
+     */
+    private String getImportantKeywords(String location) {
+        Matcher matcher = LOCATION_KEYWORD_PATTERN.matcher(location);
+        if (matcher.find()) {
+            return matcher.group(0);
+        } else {
+            return location;
+        }
     }
 
 

src/main/java/seedu/address/ui/CommandBox.java

@@ -131,8 +131,8 @@ public CommandBox(Logic logic) {
         configPrefixList();
         keywordLabel.getStyleClass().add("keyword-label-default");
         keywordColorMap = getCommandKeywordColorMap();
-        String[] commands = {"help", "add", "list", "edit", "find",
-            "delete", "select", "history", "undo", "redo", "clear", "exit", "customise", "view", "swt"};
+        String[] commands = {"help", "add", "list", "edit", "find", "delete", "select", "history", "undo", "redo",
+            "clear", "exit", "customise", "view", "theme", "mark", "unmark", "remark", "color"};
         TextFields.bindAutoCompletion(commandTextField, commands); // controlsfx
         tick.setFitHeight(30);
         tick.setFitWidth(30);