Merge pull request #10 from t0xicCode/single-course-select

Improve course selection UI
morinted · Jun 16, 2016 · 25fc328 · 25fc328
2 parents 13b5653 + ce0e373
commit 25fc328
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/schedule-generator/ca/uottawa/ui/ClientGUI.java b/schedule-generator/ca/uottawa/ui/ClientGUI.java
@@ -791,14 +791,19 @@ private void removeCourse() {
 	 * Add the currently selected course.
 	 */
 	private void addCourse() {
-		if (lstSearchResults.getSelectedValue() == null) {
+		if (lstSearchResults.getSelectedValue() == null && lstSearchResults.getModel().getSize() != 1) {
 			display("No course selected!");
-		} else {
-				String courseCode = lstSearchResults.getSelectedValue().split(" ")[0];
-				//Determine if we're sending an optional or mandatory course.
-				String optional = chkOptional.isSelected() ? "OPTIONAL " : "";
-				send("ADD " + optional + courseCode);
+			return;
+		}
+
+		if (lstSearchResults.getSelectedValue() == null) {
+			lstSearchResults.setSelectedIndex(0);
 		}
+
+		String courseCode = lstSearchResults.getSelectedValue().split(" ")[0];
+		//Determine if we're sending an optional or mandatory course.
+		String optional = chkOptional.isSelected() ? "OPTIONAL " : "";
+		send("ADD " + optional + courseCode);
 	}
 
 	/**